Merge pull request #5860 from Montellese/fix_content_settings_for_real

fix content settings not being properly evaluated/stored

2 files changed, 9 insertions, 1 deletions

diff --git a/xbmc/settings/dialogs/GUIDialogContentSettings.cpp b/xbmc/settings/dialogs/GUIDialogContentSettings.cpp
index 2e50632746..541cba74a4 100644
--- a/xbmc/settings/dialogs/GUIDialogContentSettings.cpp
+++ b/xbmc/settings/dialogs/GUIDialogContentSettings.cpp
@@ -77,7 +77,6 @@ bool CGUIDialogContentSettings::OnMessage(CGUIMessage &message)
     {
       m_scrapers.clear();
       m_vecItems->Clear();
-      m_content = CONTENT_NONE;
 
       break;
     }
@@ -171,6 +170,11 @@ void CGUIDialogContentSettings::SetContent(CONTENT_TYPE content)
   m_content = m_originalContent = content;
 }
 
+void CGUIDialogContentSettings::ResetContent()
+{
+  SetContent(CONTENT_NONE);
+}
+
 void CGUIDialogContentSettings::SetScanSettings(const VIDEO::SScanSettings &scanSettings)
 {
   m_scanRecursive       = (scanSettings.recurse > 0 && !scanSettings.parent_name) ||
@@ -248,6 +252,9 @@ bool CGUIDialogContentSettings::Show(ADDON::ScraperPtr& scraper, VIDEO::SScanSet
     }
   }
 
+  // now that we have evaluated all settings we need to reset the content
+  dialog->ResetContent();
+
   return confirmed;
 }
 
diff --git a/xbmc/settings/dialogs/GUIDialogContentSettings.h b/xbmc/settings/dialogs/GUIDialogContentSettings.h
index 9cf5bdbf19..f40e875fa2 100644
--- a/xbmc/settings/dialogs/GUIDialogContentSettings.h
+++ b/xbmc/settings/dialogs/GUIDialogContentSettings.h
@@ -47,6 +47,7 @@ public:
 
   CONTENT_TYPE GetContent() const { return m_content; }
   void SetContent(CONTENT_TYPE content);
+  void ResetContent();
 
   const ADDON::ScraperPtr& GetScraper() const { return m_scraper; }
   void SetScraper(ADDON::ScraperPtr scraper) { m_scraper = scraper; }