diff options
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index bcc536c24..fcb24b5e7 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -552,6 +552,9 @@ public class CameraActivity extends Activity */ private void updateActionBarMenu(int dataID) { LocalData currentData = mDataAdapter.getLocalData(dataID); + if (currentData == null) { + return; + } int type = currentData.getLocalDataType(); if (mActionBarMenu == null) { @@ -716,7 +719,7 @@ public class CameraActivity extends Activity private void removeData(int dataID) { mDataAdapter.removeData(CameraActivity.this, dataID); - updateActionBarMenu(dataID); + updateActionBarMenu(mFilmStripView.getCurrentId()); if (mDataAdapter.getTotalNumber() > 1) { showUndoDeletionBar(); } else { |