From d36c436143ca484e20f57d7c16f7654deaee26cc Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Thu, 16 Aug 2012 11:23:40 -0400
Subject: [PATCH] Added a null check for mProgress in
 ListActivity.onActivityResult()

closes #143
---
 LocationRinger/AndroidManifest.xml                            | 4 ++--
 .../TwentyCodes/android/LocationRinger/ui/ListActivity.java   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/LocationRinger/AndroidManifest.xml b/LocationRinger/AndroidManifest.xml
index 9a27608..5d56bee 100644
--- a/LocationRinger/AndroidManifest.xml
+++ b/LocationRinger/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.TwentyCodes.android.LocationRinger"
     android:installLocation="internalOnly"
-    android:versionCode="146"
-    android:versionName="7a726f2" >
+    android:versionCode="151"
+    android:versionName="d1b09be" >
 
     <uses-sdk android:minSdkVersion="7"/>
 
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/ListActivity.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/ListActivity.java
index f92a877..de35a08 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/ListActivity.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/ListActivity.java
@@ -66,7 +66,8 @@ public class ListActivity extends Activity implements OnItemClickListener, OnCli
 	@Override
 	public void onActivityResult(final int requestCode, final int resultCode, final Intent intent) {
 		super.onActivityResult(requestCode, resultCode, intent);
-		mProgress.dismiss();
+		if(mProgress != null)
+			mProgress.dismiss();
 
 		if (resultCode == RESULT_OK) {