From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Sun, 29 Jan 2012 02:46:43 +0000 (+0000)
Subject: Fix npe when one uses the back button to get rid of the query instead of executing... 
X-Git-Tag: upstream/12.03~1^2~94
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=199aa5f6964285fe6872b4dcd4a9b638ed865c08;p=debian%2Fopenrocket

Fix npe when one uses the back button to get rid of the query instead of executing a query.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@377 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java
index 62d7cad3..70dc4b79 100644
--- a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java
+++ b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java
@@ -83,7 +83,7 @@ public class TCQueryAction {
 		
 		mDbHelper.close();
 		
-		if ( progress.isShowing() ) {
+		if ( progress != null && progress.isShowing() ) {
 			progress.dismiss();
 		}
 	}