only register event when content is not null

lightChenStu · Aug 16, 2016 · 2e319a3 · 2e319a3
1 parent 2928608
commit 2e319a3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cocos2d/core/components/CCScrollView.js b/cocos2d/core/components/CCScrollView.js
@@ -1339,7 +1339,9 @@ var ScrollView = cc.Class({
         this._calculateBoundary();
         //Because widget component will adjust content position and scrollview position is correct after visit
         //So this event could make sure the content is on the correct position after loading.
-        cc.director.once(cc.Director.EVENT_AFTER_VISIT, this._adjustContentOutOfBoundary, this);
+        if(this.content) {
+            cc.director.once(cc.Director.EVENT_AFTER_VISIT, this._adjustContentOutOfBoundary, this);
+        }
     },
 
     onDestroy: function() {