Another bug fix to go with Issue 1044 -- this one only cropped up on my tablet though

git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2014 59b500cc-1b3d-0410-9834-0bbf25fbcc57

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/google/zxing/client/android/camera/CameraManager.java b/src/com/google/zxing/client/android/camera/CameraManager.java
index 746d1a6b..b7f2206c 100755
--- a/src/com/google/zxing/client/android/camera/CameraManager.java
+++ b/src/com/google/zxing/client/android/camera/CameraManager.java
@@ -245,7 +245,11 @@ public final class CameraManager {
    */
   public Rect getFramingRectInPreview() {
     if (framingRectInPreview == null) {
-      Rect rect = new Rect(getFramingRect());
+      Rect framingRect = getFramingRect();
+      if (framingRect == null) {
+        return null;
+      }
+      Rect rect = new Rect(framingRect);
       Point cameraResolution = configManager.getCameraResolution();
       Point screenResolution = configManager.getScreenResolution();
       rect.left = rect.left * cameraResolution.x / screenResolution.x;