fix addon settings dialog not resetting correctly on unload

jmarshallnz · Jul 22, 2012 · a109fb7 · a109fb7
1 parent d4e069b
commit a109fb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/xbmc/addons/GUIDialogAddonSettings.cpp b/xbmc/addons/GUIDialogAddonSettings.cpp
@@ -98,7 +98,7 @@ bool CGUIDialogAddonSettings::OnMessage(CGUIMessage& message)
       bool bCloseDialog = false;
 
       if (iControl == ID_BUTTON_DEFAULT)
-        SetDefaults();
+        SetDefaultSettings();
       else if (iControl != ID_BUTTON_OK)
         bCloseDialog = ShowVirtualKeyboard(iControl);
 
@@ -1079,7 +1079,7 @@ CStdString CGUIDialogAddonSettings::GetString(const char *value, bool subSetting
 }
 
 // Go over all the settings and set their default values
-void CGUIDialogAddonSettings::SetDefaults()
+void CGUIDialogAddonSettings::SetDefaultSettings()
 {
   if(!m_addon)
     return;

diff --git a/xbmc/addons/GUIDialogAddonSettings.h b/xbmc/addons/GUIDialogAddonSettings.h
@@ -70,7 +70,7 @@ class CGUIDialogAddonSettings : public CGUIDialogBoxBase
   void FreeControls();
   void UpdateFromControls();
   void EnableControls();
-  void SetDefaults();
+  void SetDefaultSettings();
   bool GetCondition(const CStdString &condition, const int controlId);
 
   void SaveSettings(void);