diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-03-10 07:35:35 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-03-10 07:35:35 +0000 |
| commit | abaa0c0f1dde455cd3247b8c6eeb34860903abdc (patch) | |
| tree | c08d1aa1f5ed75a685726d6bfb0ff3c590356ed7 /guilib | |
| parent | 156c7986482825af3ccf8598caac35238e3aeca3 (diff) | |
changed: Introduce a virtual window id for the start window to ensure we aren't reading from the skin prior to it being loaded.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28510 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
| -rw-r--r-- | guilib/GUIWindowManager.cpp | 5 | ||||
| -rw-r--r-- | guilib/Key.h | 3 | ||||
| -rw-r--r-- | guilib/SkinInfo.cpp | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/guilib/GUIWindowManager.cpp b/guilib/GUIWindowManager.cpp index 6b82842aac..8e69ba4652 100644 --- a/guilib/GUIWindowManager.cpp +++ b/guilib/GUIWindowManager.cpp @@ -29,6 +29,7 @@ #include "Util.h" #include "GUISettings.h" #include "Settings.h" +#include "SkinInfo.h" using namespace std; @@ -360,6 +361,10 @@ void CGUIWindowManager::ActivateWindow_Internal(int iWindowID, const vector<CStd // destination path cannot be used with virtual window passParams = false; } + if (iWindowID == WINDOW_START) + { // virtual start window + iWindowID = g_SkinInfo.GetStartWindow(); + } // debug CLog::Log(LOGDEBUG, "Activating window ID: %i", iWindowID); diff --git a/guilib/Key.h b/guilib/Key.h index b5f0113215..965dd5eb19 100644 --- a/guilib/Key.h +++ b/guilib/Key.h @@ -380,7 +380,8 @@ #define WINDOW_MUSIC_OVERLAY 12903 #define WINDOW_VIDEO_OVERLAY 12904 -#define WINDOW_STARTUP 12999 // for startup animations +#define WINDOW_START 12998 // first window to load +#define WINDOW_STARTUP_ANIM 12999 // for startup animations // WINDOW_ID's from 13000 to 13099 reserved for Python diff --git a/guilib/SkinInfo.cpp b/guilib/SkinInfo.cpp index 2e3a6aa812..4108749ccf 100644 --- a/guilib/SkinInfo.cpp +++ b/guilib/SkinInfo.cpp @@ -336,6 +336,6 @@ int CSkinInfo::GetFirstWindow() const { int startWindow = GetStartWindow(); if (HasSkinFile("Startup.xml") && (!m_onlyAnimateToHome || startWindow == WINDOW_HOME)) - startWindow = WINDOW_STARTUP; + startWindow = WINDOW_STARTUP_ANIM; return startWindow; } |