Fix a race condition in the resize listener & use the correct merged config object...

diff --git a/src/core/core.js b/src/core/core.js
index d930c024fd0f4017991a8a75be38a2701e11395a..039f344199dfd76bc46763a8385bf652e1f3f499 100755 (executable)
--- a/src/core/core.js
+++ b/src/core/core.js
@@ -58,19 +58,18 @@
                Chart.helpers.retinaScale(this);
 
                // Always bind this so that if the responsive state changes we still work
+               if (config) {
+                       this.controller = new Chart.Controller(this);
+               }
+
                var _this = this;
                Chart.helpers.addResizeListener(context.canvas.parentNode, function() {
-                       if (config.options.responsive) {
+                       if (_this.controller && _this.controller.config.options.responsive) {
                                _this.controller.resize();
                        }
                });
 
-               if (config) {
-                       this.controller = new Chart.Controller(this);
-                       return this.controller;
-               }
-
-               return this;
+               return this.controller ? this.controller : this;
 
        };