From 64b15e711cbbc9ec47ef4e37b241b40770649081 Mon Sep 17 00:00:00 2001 From: jmarshallnz Date: Thu, 2 Dec 2010 08:38:05 +0000 Subject: [PATCH] merged: r33362 from trunk fixed: Remove hack of pushing up set content dialog on press of Info where content hasn't been set - means that Info as default select action works for non-library items. git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35570 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 --- xbmc/GUIWindowVideoBase.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/xbmc/GUIWindowVideoBase.cpp b/xbmc/GUIWindowVideoBase.cpp index a2317280924e2..ff0f9dd25bb45 100644 --- a/xbmc/GUIWindowVideoBase.cpp +++ b/xbmc/GUIWindowVideoBase.cpp @@ -952,13 +952,7 @@ bool CGUIWindowVideoBase::OnInfo(int iItem) m_database.HasTvShowInfo(strDir) || m_database.HasEpisodeInfo(item->m_strPath))) { - // hack - CGUIDialogVideoScan* pDialog = (CGUIDialogVideoScan*)g_windowManager.GetWindow(WINDOW_DIALOG_VIDEO_SCAN); - if (pDialog && pDialog->IsScanning()) - return true; - - CGUIWindowVideoFiles::OnAssignContent(strDir,1, scraper, settings); - return true; + return false; } if (scraper && scraper->Content() == CONTENT_TVSHOWS && foundDirectly && !settings.parent_name_root) // dont lookup on root tvshow folder