aboutsummaryrefslogtreecommitdiff
path: root/guilib/GUIWindowManager.h
diff options
context:
space:
mode:
authorelupus <elupus@svn>2010-06-20 01:38:55 +0000
committerelupus <elupus@svn>2010-06-20 01:38:55 +0000
commit628ec5ff2e79ad1f83219733de0280239eae348d (patch)
treea6e80c33fe1338c48554e7af5f08e0c980f0bde0 /guilib/GUIWindowManager.h
parente569b94756a79e327dfc0e86c1d7b8a83c12bfcf (diff)
changed: delete python windows from app thread, and only when we are not nested
changed: when a window is removed, it should not be part of the open dialogs list either git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@31222 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIWindowManager.h')
-rw-r--r--guilib/GUIWindowManager.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/guilib/GUIWindowManager.h b/guilib/GUIWindowManager.h
index 2beb098846..e68af05170 100644
--- a/guilib/GUIWindowManager.h
+++ b/guilib/GUIWindowManager.h
@@ -125,6 +125,7 @@ private:
WindowMap m_mapWindows;
std::vector <CGUIWindow*> m_vecCustomWindows;
std::vector <CGUIWindow*> m_activeDialogs;
+ std::vector <CGUIWindow*> m_deleteWindows;
typedef std::vector<CGUIWindow*>::iterator iDialog;
typedef std::vector<CGUIWindow*>::const_iterator ciDialog;
typedef std::vector<CGUIWindow*>::reverse_iterator rDialog;
@@ -138,6 +139,7 @@ private:
std::vector <IMsgTargetCallback*> m_vecMsgTargets;
bool m_bShowOverlay;
+ int m_iNested;
};
/*!