fixed: clear item vector when content type is changed to none

(cherry picked from commit 5c04cf9fc90f355ec6e44aab52ff97f1b4d306f1)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@35502 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/xbmc/GUIDialogContentSettings.cpp b/xbmc/GUIDialogContentSettings.cpp
index 750449d..1cd3b85 100644 (file)
--- a/xbmc/GUIDialogContentSettings.cpp
+++ b/xbmc/GUIDialogContentSettings.cpp
@@ -113,6 +113,9 @@ void CGUIDialogContentSettings::OnWindowLoaded()
 
 void CGUIDialogContentSettings::SetupPage()
 {
+  CGUIMessage msgReset(GUI_MSG_LABEL_RESET, GetID(), CONTROL_SCRAPER_LIST);
+  OnMessage(msgReset);
+  m_vecItems->Clear();
   if (m_content == CONTENT_NONE)
   {
     m_bShowScanSettings = false;
@@ -299,11 +302,8 @@ void CGUIDialogContentSettings::FillContentTypes(const CONTENT_TYPE &content)
 
 void CGUIDialogContentSettings::FillListControl()
 {
-  CGUIMessage msgReset(GUI_MSG_LABEL_RESET, GetID(), CONTROL_SCRAPER_LIST);
-  OnMessage(msgReset);
   int iIndex=0;
   int selectedIndex = 0;
-  m_vecItems->Clear();
 
   if (m_scrapers.size() == 0 || m_scrapers.find(m_content) == m_scrapers.end())
     return;