incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From macdo...@apache.org
Subject android commit: Fixing app crash when clicking Menu or Back buttons while splashscreen is being shown.
Date Thu, 23 Feb 2012 17:37:17 GMT
Updated Branches:
  refs/heads/master e85394dd9 -> 5722d976c


Fixing app crash when clicking Menu or Back buttons while splashscreen is being shown.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/5722d976
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/5722d976
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/5722d976

Branch: refs/heads/master
Commit: 5722d976ce82a74f1955a65016363bd276c14ce4
Parents: e85394d
Author: macdonst <simon.macdonald@gmail.com>
Authored: Thu Feb 23 12:36:38 2012 -0500
Committer: macdonst <simon.macdonald@gmail.com>
Committed: Thu Feb 23 12:36:38 2012 -0500

----------------------------------------------------------------------
 framework/src/org/apache/cordova/DroidGap.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/5722d976/framework/src/org/apache/cordova/DroidGap.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index 4062bf9..d0c039a 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -908,7 +908,9 @@ public class DroidGap extends Activity implements CordovaInterface {
             this.appView.loadUrl("about:blank");
 
             // Forward to plugins
-            this.pluginManager.onDestroy();
+            if (this.pluginManager != null) {
+                this.pluginManager.onDestroy();
+            }
         }
         else {
             this.endActivity();
@@ -924,7 +926,9 @@ public class DroidGap extends Activity implements CordovaInterface {
     public void postMessage(String id, Object data) {
         
         // Forward to plugins
-        this.pluginManager.postMessage(id, data);
+        if (this.pluginManager != null) {
+            this.pluginManager.postMessage(id, data);
+        }
     }
 
     /**


Mime
View raw message