diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-01-18 23:17:14 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-01-18 23:17:14 +0000 |
| commit | d29a9081e31c5423692c77aec869471a6eb95247 (patch) | |
| tree | 48eb7699f591c9dac5c0f731554ba1967648c619 /guilib/GUIWindowManager.cpp | |
| parent | 4c93098fa69804ed40526f5b76c2513e081f01f5 (diff) | |
changed: Moved the XML filename of windows into a property. Retrieve using Window.Property(xmlfile). Ticket #8551, thanks to EqUiNoX
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@26995 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIWindowManager.cpp')
| -rw-r--r-- | guilib/GUIWindowManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guilib/GUIWindowManager.cpp b/guilib/GUIWindowManager.cpp index 43f756b7d6..7cf12f73c3 100644 --- a/guilib/GUIWindowManager.cpp +++ b/guilib/GUIWindowManager.cpp @@ -753,12 +753,12 @@ bool CGUIWindowManager::IsWindowActive(const CStdString &xmlFile, bool ignoreClo { CSingleLock lock(g_graphicsContext); CGUIWindow *window = GetWindow(GetActiveWindow()); - if (window && CUtil::GetFileName(window->GetXMLFile()).Equals(xmlFile)) return true; + if (window && CUtil::GetFileName(window->GetProperty("xmlfile")).Equals(xmlFile)) return true; // run through the dialogs for (ciDialog it = m_activeDialogs.begin(); it != m_activeDialogs.end(); ++it) { CGUIWindow *window = *it; - if (CUtil::GetFileName(window->GetXMLFile()).Equals(xmlFile) && (!ignoreClosing || !window->IsAnimating(ANIM_TYPE_WINDOW_CLOSE))) + if (CUtil::GetFileName(window->GetProperty("xmlfile")).Equals(xmlFile) && (!ignoreClosing || !window->IsAnimating(ANIM_TYPE_WINDOW_CLOSE))) return true; } return false; // window isn't active @@ -880,7 +880,7 @@ bool CGUIWindowManager::IsWindowTopMost(int id) const bool CGUIWindowManager::IsWindowTopMost(const CStdString &xmlFile) const { CGUIWindow *topMost = GetTopMostDialog(); - if (topMost && CUtil::GetFileName(topMost->GetXMLFile()).Equals(xmlFile)) + if (topMost && CUtil::GetFileName(topMost->GetProperty("xmlfile")).Equals(xmlFile)) return true; return false; } |