actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix g_bIsShowingDialog not being set false

Browse Source
This commit is contained in:
Glenn Maynard
2004-08-09 19:50:09 +00:00
parent 9edce13765
commit 1a7be98f86
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Dialog/Dialog.cpp
+10 -4
View File
@@ -146,12 +146,15 @@ Dialog::Result Dialog::AbortRetryIgnore( CString sMessage, CString ID )
g_bIsShowingDialog = true; g_bIsShowingDialog = true;
// only show Dialog if windowed // only show Dialog if windowed
Dialog::Result ret;
if( !g_bWindowed ) if( !g_bWindowed )
return g_pNullDriver.AbortRetryIgnore( sMessage, ID ); ret = g_pNullDriver.AbortRetryIgnore( sMessage, ID );
else else
return g_pImpl->AbortRetryIgnore( sMessage, ID ); // call derived version ret = g_pImpl->AbortRetryIgnore( sMessage, ID ); // call derived version
g_bIsShowingDialog = false; g_bIsShowingDialog = false;
return ret;
} }
Dialog::Result Dialog::RetryCancel( CString sMessage, CString ID ) Dialog::Result Dialog::RetryCancel( CString sMessage, CString ID )
@@ -164,12 +167,15 @@ Dialog::Result Dialog::RetryCancel( CString sMessage, CString ID )
g_bIsShowingDialog = true; g_bIsShowingDialog = true;
// only show Dialog if windowed // only show Dialog if windowed
Dialog::Result ret;
if( !g_bWindowed ) if( !g_bWindowed )
return g_pNullDriver.RetryCancel( sMessage, ID ); ret = g_pNullDriver.RetryCancel( sMessage, ID );
else else
return g_pImpl->RetryCancel( sMessage, ID ); // call derived version ret = g_pImpl->RetryCancel( sMessage, ID ); // call derived version
g_bIsShowingDialog = false; g_bIsShowingDialog = false;
return ret;
} }
/* /*