From 1a7be98f86fbb1557fe008147b4ec24c668717ea Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 9 Aug 2004 19:50:09 +0000 Subject: [PATCH] fix g_bIsShowingDialog not being set false --- stepmania/src/arch/Dialog/Dialog.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/stepmania/src/arch/Dialog/Dialog.cpp b/stepmania/src/arch/Dialog/Dialog.cpp index 72050b1125..de1cc84a6b 100644 --- a/stepmania/src/arch/Dialog/Dialog.cpp +++ b/stepmania/src/arch/Dialog/Dialog.cpp @@ -146,12 +146,15 @@ Dialog::Result Dialog::AbortRetryIgnore( CString sMessage, CString ID ) g_bIsShowingDialog = true; // only show Dialog if windowed + Dialog::Result ret; if( !g_bWindowed ) - return g_pNullDriver.AbortRetryIgnore( sMessage, ID ); + ret = g_pNullDriver.AbortRetryIgnore( sMessage, ID ); else - return g_pImpl->AbortRetryIgnore( sMessage, ID ); // call derived version + ret = g_pImpl->AbortRetryIgnore( sMessage, ID ); // call derived version g_bIsShowingDialog = false; + + return ret; } Dialog::Result Dialog::RetryCancel( CString sMessage, CString ID ) @@ -164,12 +167,15 @@ Dialog::Result Dialog::RetryCancel( CString sMessage, CString ID ) g_bIsShowingDialog = true; // only show Dialog if windowed + Dialog::Result ret; if( !g_bWindowed ) - return g_pNullDriver.RetryCancel( sMessage, ID ); + ret = g_pNullDriver.RetryCancel( sMessage, ID ); else - return g_pImpl->RetryCancel( sMessage, ID ); // call derived version + ret = g_pImpl->RetryCancel( sMessage, ID ); // call derived version g_bIsShowingDialog = false; + + return ret; } /*