fixed: Ticket #5221 - Skin Settings not resetting properly on skin ch…

…ange. git-svn-id: http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/linuxport/XBMC@16008 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
root · Oct 25, 2008 · 3168d3c · 3168d3c
1 parent 5523507
commit 3168d3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -2779,6 +2779,8 @@ void CApplication::UnloadSkin()
   g_colorManager.Clear();
 
   g_charsetConverter.reset();
+
+  g_infoManager.Clear();
 }
 
 bool CApplication::LoadUserWindows(const CStdString& strSkinPath)
@@ -4510,7 +4512,6 @@ HRESULT CApplication::Cleanup()
 #ifdef HAS_EVENT_SERVER
     CEventServer::RemoveInstance();
 #endif
-    g_infoManager.Clear();
     DllLoaderContainer::Clear();
     g_playlistPlayer.Clear();
     g_settings.Clear();

diff --git a/xbmc/utils/GUIInfoManager.cpp b/xbmc/utils/GUIInfoManager.cpp
@@ -3371,7 +3371,6 @@ int CGUIInfoManager::TranslateBooleanExpression(const CStdString &expression)
 
 void CGUIInfoManager::Clear()
 {
-  m_currentFile->Reset();
   m_CombinedValues.clear();
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     void CGUIInfoManager::Clear()
     {
-      m_currentFile->Reset();
       m_CombinedValues.clear();
     }
@@ Expand Down @@