Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2255 from ulion/fix_plugin_setting_not_show_problem

Fix sometimes select plugin setting from context menu not works problem.
  • Loading branch information...
commit dfcc04de77509e6e6ebfab1fa92df32f24938274 2 parents 2856263 + 4f39434
@jmarshallnz jmarshallnz authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 xbmc/windows/GUIMediaWindow.cpp
View
6 xbmc/windows/GUIMediaWindow.cpp
@@ -1603,7 +1603,11 @@ bool CGUIMediaWindow::OnContextButton(int itemNumber, CONTEXT_BUTTON button)
}
case CONTEXT_BUTTON_PLUGIN_SETTINGS:
{
- CURL plugin(m_vecItems->Get(itemNumber)->GetPath());
+ CFileItemPtr item = m_vecItems->Get(itemNumber);
+ // CONTEXT_BUTTON_PLUGIN_SETTINGS can be called for plugin item
+ // or script item; or for the plugin directory current listing.
+ bool isPluginOrScriptItem = (item && (item->IsPlugin() || item->IsScript()));
+ CURL plugin(isPluginOrScriptItem ? item->GetPath() : m_vecItems->GetPath());
ADDON::AddonPtr addon;
if (CAddonMgr::Get().GetAddon(plugin.GetHostName(), addon))
if (CGUIDialogAddonSettings::ShowAndGetInput(addon))
Please sign in to comment.
Something went wrong with that request. Please try again.