FIX: trap g_SkinInfo being null

xbmc/Application.cpp

@@ -1906,6 +1906,7 @@ void CApplication::UnloadSkin(bool forReload /* = false */)
 //  The g_SkinInfo shared_ptr ought to be reset here
 // but there are too many places it's used without checking for NULL
 // and as a result a race condition on exit can cause a crash.
+  g_SkinInfo.reset();
 }
 
 bool CApplication::LoadUserWindows()

xbmc/guilib/GUIColorManager.cpp

@@ -56,22 +56,29 @@ void CGUIColorManager::Load(const std::string &colorFile)
     LoadXML(xmlDoc);
 
   // first load the default color map if it exists
-  std::string path = URIUtils::AddFileToFolder(g_SkinInfo->Path(), "colors", "defaults.xml");
+  std::string path;
+  if (g_SkinInfo)
+  {
+    path = URIUtils::AddFileToFolder(g_SkinInfo->Path(), "colors", "defaults.xml");
 
-  if (xmlDoc.LoadFile(CSpecialProtocol::TranslatePathConvertCase(path)))
-    LoadXML(xmlDoc);
+    if (xmlDoc.LoadFile(CSpecialProtocol::TranslatePathConvertCase(path)))
+      LoadXML(xmlDoc);
+  }
 
   // now the color map requested
   if (StringUtils::EqualsNoCase(colorFile, "SKINDEFAULT"))
     return; // nothing to do
 
-  path = URIUtils::AddFileToFolder(g_SkinInfo->Path(), "colors", colorFile);
-  if (!URIUtils::HasExtension(path))
-    path += ".xml";
-  CLog::Log(LOGINFO, "Loading colors from %s", path.c_str());
+  if (g_SkinInfo)
+  {
+    path = URIUtils::AddFileToFolder(g_SkinInfo->Path(), "colors", colorFile);
+    if (!URIUtils::HasExtension(path))
+      path += ".xml";
+    CLog::Log(LOGINFO, "Loading colors from %s", path.c_str());
 
-  if (xmlDoc.LoadFile(path))
-    LoadXML(xmlDoc);
+    if (xmlDoc.LoadFile(path))
+      LoadXML(xmlDoc);
+  }
 }
 
 bool CGUIColorManager::LoadXML(CXBMCTinyXML &xmlDoc)

xbmc/interfaces/legacy/WindowXML.cpp

@@ -102,7 +102,11 @@ namespace XBMCAddon
     {
       XBMC_TRACE;
       RESOLUTION_INFO res;
-      std::string strSkinPath = g_SkinInfo->GetSkinPath(xmlFilename, &res);
+      std::string strSkinPath;
+      if (g_SkinInfo)
+        strSkinPath = g_SkinInfo->GetSkinPath(xmlFilename, &res);
+      else
+        throw WindowException("No skin loaded");
 
       if (!XFILE::CFile::Exists(strSkinPath))
       {

xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp

@@ -136,7 +136,7 @@ void CGUIDialogPeripheralSettings::InitializeSettings()
   }
 
   m_initialising = true;
-  bool usePopup = g_SkinInfo->HasSkinFile("DialogSlider.xml");
+  bool usePopup = g_SkinInfo && g_SkinInfo->HasSkinFile("DialogSlider.xml");
 
   PeripheralPtr peripheral = g_peripherals.GetByPath(m_item->GetPath());
   if (!peripheral)

xbmc/settings/SkinSettings.cpp

@@ -48,44 +48,68 @@ CSkinSettings& CSkinSettings::GetInstance()
 
 int CSkinSettings::TranslateString(const std::string &setting)
 {
+  if (!g_SkinInfo)
+    return -1;
+
   return g_SkinInfo->TranslateString(setting);
 }
 
 const std::string& CSkinSettings::GetString(int setting) const
 {
+  if (!g_SkinInfo)
+    return "";
+
   return g_SkinInfo->GetString(setting);
 }
 
 void CSkinSettings::SetString(int setting, const std::string &label)
 {
+  if (!g_SkinInfo)
+    return;
+
   g_SkinInfo->SetString(setting, label);
   g_SkinInfo->SaveSettings();
 }
 
 int CSkinSettings::TranslateBool(const std::string &setting)
 {
+  if (!g_SkinInfo)
+    return -1;
+
   return g_SkinInfo->TranslateBool(setting);
 }
 
 bool CSkinSettings::GetBool(int setting) const
 {
+  if (!g_SkinInfo)
+    return false;
+
   return g_SkinInfo->GetBool(setting);
 }
 
 void CSkinSettings::SetBool(int setting, bool set)
 {
+  if (!g_SkinInfo)
+    return;
+
   g_SkinInfo->SetBool(setting, set);
   g_SkinInfo->SaveSettings();
 }
 
 void CSkinSettings::Reset(const std::string &setting)
 {
+  if (!g_SkinInfo)
+    return;
+
   g_SkinInfo->Reset(setting);
   g_SkinInfo->SaveSettings();
 }
 
 void CSkinSettings::Reset()
 {
+  if (!g_SkinInfo)
+    return;
+
   g_SkinInfo->Reset();
   g_SkinInfo->SaveSettings();
 

xbmc/settings/dialogs/GUIDialogAudioDSPSettings.cpp

@@ -439,7 +439,7 @@ void CGUIDialogAudioDSPSettings::InitializeSettings()
     return;
   }
 
-  bool usePopup = g_SkinInfo->HasSkinFile("DialogSlider.xml");
+  bool usePopup = g_SkinInfo && g_SkinInfo->HasSkinFile("DialogSlider.xml");
 
   CVideoSettings &videoSettings = CMediaSettings::GetInstance().GetCurrentVideoSettings();
 

xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp

@@ -299,7 +299,7 @@ void CGUIDialogAudioSubtitleSettings::InitializeSettings()
     return;
   }
 
-  bool usePopup = g_SkinInfo->HasSkinFile("DialogSlider.xml");
+  bool usePopup = g_SkinInfo && g_SkinInfo->HasSkinFile("DialogSlider.xml");
 
   CVideoSettings &videoSettings = CMediaSettings::GetInstance().GetCurrentVideoSettings();
 

xbmc/video/dialogs/GUIDialogVideoSettings.cpp

@@ -248,7 +248,7 @@ void CGUIDialogVideoSettings::InitializeSettings()
     return;
   }
 
-  bool usePopup = g_SkinInfo->HasSkinFile("DialogSlider.xml");
+  bool usePopup = g_SkinInfo && g_SkinInfo->HasSkinFile("DialogSlider.xml");
 
   CVideoSettings &videoSettings = CMediaSettings::GetInstance().GetCurrentVideoSettings();
 

xbmc/windows/GUIWindowDebugInfo.cpp

@@ -53,7 +53,7 @@ CGUIWindowDebugInfo::~CGUIWindowDebugInfo(void)
 
 void CGUIWindowDebugInfo::UpdateVisibility()
 {
-  if (LOG_LEVEL_DEBUG_FREEMEM <= g_advancedSettings.m_logLevel || g_SkinInfo->IsDebugging())
+  if (LOG_LEVEL_DEBUG_FREEMEM <= g_advancedSettings.m_logLevel || (g_SkinInfo && g_SkinInfo->IsDebugging()))
     Open();
   else
     Close();
@@ -125,7 +125,7 @@ void CGUIWindowDebugInfo::Process(unsigned int currentTime, CDirtyRegionList &di
   }
 
   // render the skin debug info
-  if (g_SkinInfo->IsDebugging())
+  if (g_SkinInfo && g_SkinInfo->IsDebugging())
   {
     if (!info.empty())
       info += "\n";