[addons] fix addon browser not propagating unknown context menu butto…

…ns to base class
popcornmix · Mar 2, 2015 · f954a1e · f954a1e
1 parent c4b50e7
commit f954a1e
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/xbmc/addons/GUIWindowAddonBrowser.cpp b/xbmc/addons/GUIWindowAddonBrowser.cpp
@@ -197,32 +197,33 @@ bool CGUIWindowAddonBrowser::OnContextButton(int itemNumber,
       return true;
     }
   }
-  AddonPtr addon;
-  if (!CAddonMgr::Get().GetAddon(pItem->GetProperty("Addon.ID").asString(), addon, ADDON_UNKNOWN, false)) // allow disabled addons
-    return false;
 
-  if (button == CONTEXT_BUTTON_SETTINGS)
-    return CGUIDialogAddonSettings::ShowAndGetInput(addon);
-
-  if (button == CONTEXT_BUTTON_REFRESH)
+  AddonPtr addon;
+  if (CAddonMgr::Get().GetAddon(pItem->GetProperty("Addon.ID").asString(), addon, ADDON_UNKNOWN, false))
   {
-    CAddonDatabase database;
-    database.Open();
-    database.DeleteRepository(addon->ID());
-    button = CONTEXT_BUTTON_SCAN;
-  }
+    if (button == CONTEXT_BUTTON_SETTINGS)
+      return CGUIDialogAddonSettings::ShowAndGetInput(addon);
 
-  if (button == CONTEXT_BUTTON_SCAN)
-  {
-    RepositoryPtr repo = std::dynamic_pointer_cast<CRepository>(addon);
-    CAddonInstaller::Get().UpdateRepos(true);
-    return true;
-  }
+    if (button == CONTEXT_BUTTON_REFRESH)
+    {
+      CAddonDatabase database;
+      database.Open();
+      database.DeleteRepository(addon->ID());
+      button = CONTEXT_BUTTON_SCAN;
+    }
 
-  if (button == CONTEXT_BUTTON_INFO)
-  {
-    CGUIDialogAddonInfo::ShowForItem(pItem);
-    return true;
+    if (button == CONTEXT_BUTTON_SCAN)
+    {
+      RepositoryPtr repo = std::dynamic_pointer_cast<CRepository>(addon);
+      CAddonInstaller::Get().UpdateRepos(true);
+      return true;
+    }
+
+    if (button == CONTEXT_BUTTON_INFO)
+    {
+      CGUIDialogAddonInfo::ShowForItem(pItem);
+      return true;
+    }
   }
 
   return CGUIMediaWindow::OnContextButton(itemNumber, button);