settings: call CSettingsManager::Clear() before uninitializing settings handlers...

diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp
index 226669a..206f048 100644 (file)
--- a/xbmc/settings/Settings.cpp
+++ b/xbmc/settings/Settings.cpp
@@ -446,6 +446,9 @@ void CSettings::Uninitialize()
   m_settingsManager->UnregisterCallback(&XBMCHelper::GetInstance());
 #endif
 
+  // cleanup the settings manager
+  m_settingsManager->Clear();
+
   // unregister ISubSettings implementations
   m_settingsManager->UnregisterSubSettings(&g_application);
   m_settingsManager->UnregisterSubSettings(&CDisplaySettings::Get());
@@ -466,9 +469,6 @@ void CSettings::Uninitialize()
   m_settingsManager->UnregisterSettingsHandler(&CProfilesManager::Get());
   m_settingsManager->UnregisterSettingsHandler(&g_application);
 
-  // cleanup the settings manager
-  m_settingsManager->Clear();
-
   m_initialized = false;
 }