diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2015-06-22 06:36:34 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2015-06-22 06:36:34 +0200 |
| commit | 48dc18bb6174543c5a87c3a19e5e40fd6f8523c4 (patch) | |
| tree | a43ff46ec6bef6c8e00a529704a974d1b9ce415c | |
| parent | 6da1bfd8a43d86b95c77a68a6e9d7b27024d68cf (diff) | |
| parent | 4115bc2920e28e08de2319b3dfb1a60a97afe336 (diff) | |
Merge pull request #7318 from Montellese/video_fix_set_content
video library: show "Set content" even during library scan (fixes #16061)
| -rw-r--r-- | xbmc/video/windows/GUIWindowVideoNav.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp index da888c2955..d863b0609d 100644 --- a/xbmc/video/windows/GUIWindowVideoNav.cpp +++ b/xbmc/video/windows/GUIWindowVideoNav.cpp @@ -834,19 +834,16 @@ void CGUIWindowVideoNav::GetContextButtons(int itemNumber, CContextButtons &butt database.Open(); ADDON::ScraperPtr info = database.GetScraperForPath(item->GetPath()); - if (!g_application.IsVideoScanning()) + if (!item->IsLiveTV() && !item->IsPlugin() && !item->IsAddonsPath() && !URIUtils::IsUPnP(item->GetPath())) { - if (!item->IsLiveTV() && !item->IsPlugin() && !item->IsAddonsPath() && !URIUtils::IsUPnP(item->GetPath())) + if (info && info->Content() != CONTENT_NONE) { - if (info && info->Content() != CONTENT_NONE) - buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20442); - else - buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20333); + buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20442); + buttons.Add(CONTEXT_BUTTON_SCAN, 13349); } + else + buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20333); } - - if (info) - buttons.Add(CONTEXT_BUTTON_SCAN, 13349); } } else @@ -962,13 +959,10 @@ void CGUIWindowVideoNav::GetContextButtons(int itemNumber, CContextButtons &butt // add "Set/Change content" to folders if (item->m_bIsFolder && !item->IsVideoDb() && !item->IsPlayList() && !item->IsSmartPlayList() && !item->IsLibraryFolder() && !item->IsLiveTV() && !item->IsPlugin() && !item->IsAddonsPath() && !URIUtils::IsUPnP(item->GetPath())) { - if (!g_application.IsVideoScanning()) - { - if (info && info->Content() != CONTENT_NONE) - buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20442); - else - buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20333); - } + if (info && info->Content() != CONTENT_NONE) + buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20442); + else + buttons.Add(CONTEXT_BUTTON_SET_CONTENT, 20333); if (info && info->Content() != CONTENT_NONE) buttons.Add(CONTEXT_BUTTON_SCAN, 13349); |