diff options
| author | oy <Tom_Adams@web.de> | 2010-09-08 02:27:48 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-09-08 02:27:48 +0200 |
| commit | d4b145a8ee201d25e5259aba29b65b84bb444b3a (patch) | |
| tree | 2c7bc56420027428178d7ac627d9c2857a62fe8c /src/game/client | |
| parent | cbf07ffa57c64a1a6ecc454716a6f3ebc586d7e8 (diff) | |
| download | zcatch-d4b145a8ee201d25e5259aba29b65b84bb444b3a.tar.gz zcatch-d4b145a8ee201d25e5259aba29b65b84bb444b3a.zip | |
fixed Gui lock while deleting/reading demos. Closes #167
Diffstat (limited to 'src/game/client')
| -rw-r--r-- | src/game/client/components/menus_demo.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp index 6c5dcbe4..2880da25 100644 --- a/src/game/client/components/menus_demo.cpp +++ b/src/game/client/components/menus_demo.cpp @@ -546,6 +546,11 @@ void CMenus::RenderDemoList(CUIRect MainView) const char *pError = Client()->DemoPlayer_Play(m_lDemos[s_SelectedItem].m_aFilename); if(pError) PopupMessage(Localize("Error"), str_comp(pError, "error loading demo") ? pError : Localize("error loading demo"), Localize("Ok")); + else + { + UI()->SetActiveItem(0); + return; + } } } } @@ -556,7 +561,10 @@ void CMenus::RenderDemoList(CUIRect MainView) if(DoButton_Menu(&s_DeleteButton, Localize("Delete"), 0, &DeleteRect) || m_DeletePressed) { if(s_SelectedItem >= 0 && s_SelectedItem < m_lDemos.size()) + { + UI()->SetActiveItem(0); m_Popup = POPUP_DELETE_DEMO; + } } } } |