Merge branch 'v3.1.x'

torkelo · torkelo · commit 79138e211fac · 2016-07-29T15:07:17.000+02:00
diff --git a/public/app/core/profiler.ts b/public/app/core/profiler.ts
@@ -101,7 +101,8 @@ export class Profiler {
   renderingCompleted(panelId, panelTimings) {
     // add render counter to root scope
     // used by phantomjs render.js to know when panel has rendered
-    this.$rootScope.panelsRendered = this.panelsRendered + 1;
+    this.panelsRendered = (this.panelsRendered || 0) + 1;
+    this.$rootScope.panelsRendered = this.panelsRendered;
 
     if (this.enabled) {
       panelTimings.renderEnd = new Date().getTime();
