Merge pull request #1977 from pandamicro/v1.6

Fix failed to cancel callback when setting fps
This commit is contained in:
Jare Guo
2017-09-12 16:57:13 +08:00
committed by GitHub
+1 -3
View File
@@ -563,15 +563,13 @@ var game = {
callback = function () {
if (!self._paused) {
self._intervalId = window.requestAnimFrame(callback);
if (frameRate === 30) {
if (skip = !skip) {
self._intervalId = window.requestAnimFrame(callback);
return;
}
}
director.mainLoop();
self._intervalId = window.requestAnimFrame(callback);
}
};