summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r--src/com/android/camera/CameraActivity.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index fffd016fe..c4cd4014a 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1825,7 +1825,10 @@ public class CameraActivity extends Activity
mWakeLock.release();
Log.d(TAG, "wake lock release");
}
- SettingsManager.getInstance().destroyInstance();
+ SettingsManager settingsMngr = SettingsManager.getInstance();
+ if (settingsMngr != null) {
+ settingsMngr.destroyInstance();
+ }
if (mCursor != null) {
if (mSecureCamera) {
unregisterReceiver(mScreenOffReceiver);