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

@@ -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