Repository: cordova-ios
Updated Branches:
  refs/heads/master a7f059c01 -> a36259abf


CB-10530 - App freezes sometimes directly after starting on iOS


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/afe10278
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/afe10278
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/afe10278

Branch: refs/heads/master
Commit: afe10278d3ee5899b73a140b55f78361ed8606f3
Parents: a7f059c
Author: Shazron Abdullah <shaz...@apache.org>
Authored: Tue Feb 16 15:26:24 2016 -0800
Committer: Steve Gill <stevengil...@gmail.com>
Committed: Wed Feb 24 16:02:49 2016 -0800

----------------------------------------------------------------------
 cordova-js-src/exec.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/afe10278/cordova-js-src/exec.js
----------------------------------------------------------------------
diff --git a/cordova-js-src/exec.js b/cordova-js-src/exec.js
index 06cb1c2..3fb7fa1 100644
--- a/cordova-js-src/exec.js
+++ b/cordova-js-src/exec.js
@@ -134,9 +134,18 @@ function iOSExec() {
     }
 }
 
+// CB-10530
+function proxyChanged() {
+    var cexec = cordovaExec();
+       
+    return (execProxy !== cexec && // proxy objects are different
+            iOSExec !== cexec      // proxy object is not the current iOSExec
+            );
+}
+
 // CB-10106
 function handleBridgeChange() {
-    if (execProxy !== cordovaExec()) {
+    if (proxyChanged()) {
         var commandString = commandQueue.shift();
         while(commandString) {
             var command = JSON.parse(commandString);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

Reply via email to