projects
/
zxing.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
- Fixed a crash on first launch after install on some hardware.
[zxing.git]
/
android
/
src
/
com
/
google
/
zxing
/
client
/
android
/
CameraManager.java
diff --git
a/android/src/com/google/zxing/client/android/CameraManager.java
b/android/src/com/google/zxing/client/android/CameraManager.java
index
330b045
..
9ac5f47
100755
(executable)
--- a/
android/src/com/google/zxing/client/android/CameraManager.java
+++ b/
android/src/com/google/zxing/client/android/CameraManager.java
@@
-208,6
+208,9
@@
final class CameraManager {
*/
public Rect getFramingRect() {
if (framingRect == null) {
+ if (camera == null) {
+ return null;
+ }
int width = cameraResolution.x * 3 / 4;
if (width < MIN_FRAME_WIDTH) {
width = MIN_FRAME_WIDTH;