From 10e1808c5671ae15b11fa5bb9eb48f3228b2d8f8 Mon Sep 17 00:00:00 2001
From: Bryce Curtis <curtis.bryce@gmail.com>
Date: Tue, 31 May 2011 15:11:02 -0500
Subject: [PATCH] Clean up CallbackServer when about:blank page has loaded. 
 This fixes errors when shutting down.

---
 framework/src/com/phonegap/DroidGap.java | 30 ++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 91eeb173..fae84535 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -658,21 +658,18 @@ public class DroidGap extends PhonegapActivity {
     	
         if (this.appView != null) {
     	
-    	// Make sure pause event is sent if onPause hasn't been called before onDestroy
-       	this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};");
+        	// Make sure pause event is sent if onPause hasn't been called before onDestroy
+        	this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};");
 
-       	// Send destroy event to JavaScript
-       	this.appView.loadUrl("javascript:try{PhoneGap.onDestroy.fire();}catch(e){};");
+        	// Send destroy event to JavaScript
+        	this.appView.loadUrl("javascript:try{PhoneGap.onDestroy.fire();}catch(e){};");
 
-    	// Load blank page so that JavaScript onunload is called
-       	this.appView.loadUrl("about:blank");
+        	// Load blank page so that JavaScript onunload is called
+        	this.appView.loadUrl("about:blank");
     	    	
-        // Forward to plugins
-        this.pluginManager.onDestroy();
+        	// Forward to plugins
+        	this.pluginManager.onDestroy();
 
-    	if (this.callbackServer != null) {
-    		this.callbackServer.destroy();
-    	}
         }
     }
 
@@ -1065,7 +1062,9 @@ public class DroidGap extends PhonegapActivity {
         	// Try firing the onNativeReady event in JS. If it fails because the JS is
         	// not loaded yet then just set a flag so that the onNativeReady can be fired
         	// from the JS side when the JS gets to that code.
-        	appView.loadUrl("javascript:try{ PhoneGap.onNativeReady.fire();}catch(e){_nativeReady = true;}");
+        	if (!url.equals("about:blank")) {
+        		appView.loadUrl("javascript:try{ PhoneGap.onNativeReady.fire();}catch(e){_nativeReady = true;}");
+        	}
 
         	// Make app view visible
         	appView.setVisibility(View.VISIBLE);
@@ -1081,6 +1080,13 @@ public class DroidGap extends PhonegapActivity {
     			this.ctx.clearHistory = false;
     			this.ctx.appView.clearHistory();
     		}
+    		
+    		// Shutdown if blank loaded
+    		if (url.equals("about:blank")) {
+    			if (this.ctx.callbackServer != null) {
+    				this.ctx.callbackServer.destroy();
+    			}
+    		}
         }
         
         /**