1 files changed, 21 insertions, 0 deletions
diff --git a/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
index 3d4dd42fd..4eb8d09f4 100644
--- a/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
+++ b/libraries/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java
@@ -94,11 +94,18 @@ public class MenuWrapper implements Menu {
 
     @Override
     public void removeItem(int id) {
+        mNativeMap.remove(mNativeMenu.findItem(id));
         mNativeMenu.removeItem(id);
     }
 
     @Override
     public void removeGroup(int groupId) {
+        for (int i = 0; i < mNativeMenu.size(); i++) {
+            final android.view.MenuItem item = mNativeMenu.getItem(i);
+            if (item.getGroupId() == groupId) {
+                mNativeMap.remove(item);
+            }
+        }
         mNativeMenu.removeGroup(groupId);
     }
 
@@ -108,6 +115,20 @@ public class MenuWrapper implements Menu {
         mNativeMenu.clear();
     }
 
+    public void invalidate() {
+        if (mNativeMap.isEmpty()) return;
+
+        final WeakHashMap<android.view.MenuItem, MenuItem> menuMapCopy = new WeakHashMap<android.view.MenuItem, MenuItem>(mNativeMap.size());
+
+        for (int i = 0; i < mNativeMenu.size(); i++) {
+            final android.view.MenuItem item = mNativeMenu.getItem(i);
+            menuMapCopy.put(item, mNativeMap.get(item));
+        }
+
+        mNativeMap.clear();
+        mNativeMap.putAll(menuMapCopy);
+    }
+
     @Override
     public void setGroupCheckable(int group, boolean checkable, boolean exclusive) {
         mNativeMenu.setGroupCheckable(group, checkable, exclusive);