summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/camera/CameraManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraManager.java b/src/com/android/camera/CameraManager.java
index 65b2bb83a..e89c2eb81 100644
--- a/src/com/android/camera/CameraManager.java
+++ b/src/com/android/camera/CameraManager.java
@@ -334,7 +334,7 @@ public class CameraManager {
holder = mReconnectExceptionQueue.take();
} catch (InterruptedException ex) {
}
- if (holder == null || holder.ex != null) {
+ if (holder != null && holder.ex != null) {
throw holder.ex;
}
}