don't allow LoadSkin() to run during an Unload/Reload cycle

CrystalP · Mar 3, 2011 · 72eb444 · 72eb444
1 parent 27bfc6a
commit 72eb444
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -306,6 +306,7 @@ CApplication::CApplication(void) : m_itemCurrentFile(new CFileItem), m_progressT
   m_strPlayListFile = "";
   m_nextPlaylistItem = -1;
   m_bPlaybackStarting = false;
+  m_skinReloading = false;
 
 #ifdef HAS_GLX
   XInitThreads();
@@ -1471,6 +1472,7 @@ void CApplication::StopServices()
 
 void CApplication::ReloadSkin()
 {
+  m_skinReloading = false;
   CGUIMessage msg(GUI_MSG_LOAD_SKIN, -1, g_windowManager.GetActiveWindow());
   g_windowManager.SendMessage(msg);
   // Reload the skin, restoring the previously focused control.  We need this as
@@ -1488,6 +1490,9 @@ void CApplication::ReloadSkin()
 
 bool CApplication::LoadSkin(const CStdString& skinID)
 {
+  if (m_skinReloading)
+    return false;
+
   AddonPtr addon;
   if (CAddonMgr::Get().GetAddon(skinID, addon, ADDON_SKIN))
   {
@@ -1533,7 +1538,6 @@ void CApplication::LoadSkin(const SkinPtr& skin)
   vector<int> currentModelessWindows;
   g_windowManager.GetActiveModelessWindows(currentModelessWindows);
 
-  CLog::Log(LOGINFO, "  delete old skin...");
   UnloadSkin();
 
   CLog::Log(LOGINFO, "  load skin from:%s", skin->Path().c_str());
@@ -1642,8 +1646,12 @@ void CApplication::LoadSkin(const SkinPtr& skin)
   }
 }
 
-void CApplication::UnloadSkin()
+void CApplication::UnloadSkin(bool forReload /* = false */)
 {
+  m_skinReloading = forReload;
+
+  CLog::Log(LOGINFO, "Unloading old skin %s...", forReload ? "for reload " : "");
+
   g_audioManager.Enable(false);
 
   g_windowManager.DeInitialize();

diff --git a/xbmc/Application.h b/xbmc/Application.h
@@ -126,7 +126,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs
   bool IsCurrentThread() const;
   void Stop();
   void RestartApp();
-  void UnloadSkin();
+  void UnloadSkin(bool forReload = false);
   bool LoadUserWindows();
   void ReloadSkin();
   const CStdString& CurrentFile();
@@ -298,6 +298,8 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs
   bool LoadSkin(const CStdString& skinID);
   void LoadSkin(const boost::shared_ptr<ADDON::CSkinInfo>& skin);
 
+  bool m_skinReloading; // if true we disallow LoadSkin until ReloadSkin is called
+
   friend class CApplicationMessenger;
   // screensaver
   bool m_bScreenSave;

diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp
@@ -575,7 +575,7 @@ int CBuiltins::Execute(const CStdString& execString)
   }
   else if (execute.Equals("unloadskin"))
   {
-    g_application.UnloadSkin();
+    g_application.UnloadSkin(true); // we're reloading the skin after this
   }
   else if (execute.Equals("refreshrss"))
   {