diff options
| author | elupus <elupus@svn> | 2010-04-30 15:44:24 +0000 |
|---|---|---|
| committer | elupus <elupus@svn> | 2010-04-30 15:44:24 +0000 |
| commit | aa7dccf04d457ac2a7171ade6035c4ebadd92993 (patch) | |
| tree | e34e0a563e109e3a082ef2f9f76f3fa56de42539 /guilib | |
| parent | 4cd22b797f3dec5cea647fd89bcb8a0e185ee581 (diff) | |
Ticket #9126: Force global destruction order + construction order to avoid crashes at exit. Thx CrystalP for initial patch
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29685 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
| -rw-r--r-- | guilib/GraphicContext.cpp | 3 | ||||
| -rw-r--r-- | guilib/GraphicContext.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/guilib/GraphicContext.cpp b/guilib/GraphicContext.cpp index e8ddc92d12..0f1d966184 100644 --- a/guilib/GraphicContext.cpp +++ b/guilib/GraphicContext.cpp @@ -31,10 +31,11 @@ #include "TextureManager.h" #include "MouseStat.h" #include "GUIWindowManager.h" +#include "SystemGlobals.h" using namespace std; -CGraphicContext g_graphicsContext; +CGraphicContext& g_graphicsContext = g_SystemGlobals.m_graphicsContext; extern bool g_fullScreen; /* quick access to a skin setting, fine unless we starts clearing video settings */ diff --git a/guilib/GraphicContext.h b/guilib/GraphicContext.h index 9dbe36489f..0fc3faaf41 100644 --- a/guilib/GraphicContext.h +++ b/guilib/GraphicContext.h @@ -194,5 +194,5 @@ private: \ingroup graphics \brief */ -extern CGraphicContext g_graphicsContext; +extern CGraphicContext& g_graphicsContext; #endif |