diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-24 11:34:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-24 11:34:57 -0800 |
| commit | c6a607b5a0fbb99641390e67464cfe72c3836be3 (patch) | |
| tree | b81afaf654c46ff40572d5d9e67802c53b2b26a3 | |
| parent | 470bd265f7d851cb78f61229184d021e327d45e1 (diff) | |
| parent | a123fb474de7b49c067e3e812129495a5cacd103 (diff) | |
| download | Gallery3D-c6a607b5a0fbb99641390e67464cfe72c3836be3.tar.gz | |
am a123fb47: Merge "Fix for crash in PathBarLayer::recomputeComponents"
* commit 'a123fb474de7b49c067e3e812129495a5cacd103':
Fix for crash in PathBarLayer::recomputeComponents
| -rw-r--r-- | src/com/cooliris/media/PathBarLayer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/cooliris/media/PathBarLayer.java b/src/com/cooliris/media/PathBarLayer.java index c09c407..21e3a2a 100644 --- a/src/com/cooliris/media/PathBarLayer.java +++ b/src/com/cooliris/media/PathBarLayer.java @@ -290,8 +290,10 @@ public final class PathBarLayer extends Layer { int numComponents = mComponents.size(); for (int i = 0; i < numComponents; i++) { Component component = mComponents.get(i); - width -= (component.getIconWidth() + 20.0f * App.PIXEL_DENSITY); - component.computeLabel(width); + if (component != null) { + width -= (component.getIconWidth() + 20.0f * App.PIXEL_DENSITY); + component.computeLabel(width); + } } } } |