Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[fix] a couple crashes on exit on windows.

  • Loading branch information...
commit 47c320bcc33c326c5bb594628dcaa924a1228885 1 parent 31843b4
Jim Carroll authored
4 xbmc/Application.cpp
View
@@ -2076,7 +2076,9 @@ void CApplication::UnloadSkin(bool forReload /* = false */)
g_infoManager.Clear();
- g_SkinInfo.reset();
+// The g_SkinInfo boost 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.
}
bool CApplication::LoadUserWindows()
1  xbmc/SystemGlobals.cpp
View
@@ -55,7 +55,6 @@
#include "linux/RBP.h"
#endif
- CGUISettings g_guiSettings;
CSettings g_settings;
CXBMCRenderManager g_renderManager;
4 xbmc/settings/GUISettings.h
View
@@ -25,6 +25,7 @@
#include "guilib/Resolution.h"
#include "addons/IAddon.h"
#include "utils/Observer.h"
+#include "utils/GlobalsHandling.h"
class TiXmlNode;
class TiXmlElement;
@@ -526,4 +527,5 @@ class CGUISettings : public Observable
void LoadFromXML(TiXmlElement *pRootElement, mapIter &it, bool advanced = false);
};
-extern CGUISettings g_guiSettings;
+XBMC_GLOBAL_REF(CGUISettings, g_guiSettings);
+#define g_guiSettings XBMC_GLOBAL_USE(CGUISettings)
Please sign in to comment.
Something went wrong with that request. Please try again.