Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid spurious assert when cancelling wxProgressDialog

Browse Source 
If Cancel/close button was pressed twice in a row, assert checking that
the dialog state was "Continue" could be triggered, which was worse than
annoying as it resulted in a deadlock due to trying to show the assert
dialog box while holding the critical section that prevented the main
thread from continuing.

Allow the state to be either "Continue" or already be set to "Canceled"
now to account for this case.

Still assert for the other invalid states, but they really aren't
supposed to be possible here.
This commit is contained in:
Vadim Zeitlin
2017-10-29 20:20:30 +01:00
parent dc5802746d
commit d7ec02636a
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/msw/progdlg.cpp
View File

@@ -1175,18 +1175,38 @@ wxProgressDialogTaskRunner::TaskDialogCallbackProc
// a finished dialog.
if ( sharedData->m_style & wxPD_CAN_ABORT )
{
wxCHECK_MSG
(
sharedData->m_state == wxProgressDialog::Continue,
TRUE,
"Dialog not in a cancelable state!"
);
switch ( sharedData->m_state )
{
case wxProgressDialog::Canceled:
// It can happen that we receive a second
// cancel request before we had time to process
// the first one, in which case simply do
// nothing for the subsequent one.
break;
::SendMessage(hwnd, TDM_ENABLE_BUTTON, Id_SkipBtn, FALSE);
EnableCloseButtons(hwnd, false);
case wxProgressDialog::Continue:
::SendMessage(hwnd, TDM_ENABLE_BUTTON, Id_SkipBtn, FALSE);
EnableCloseButtons(hwnd, false);
sharedData->m_timeStop = wxGetCurrentTime();
sharedData->m_state = wxProgressDialog::Canceled;
sharedData->m_timeStop = wxGetCurrentTime();
sharedData->m_state = wxProgressDialog::Canceled;
break;
// States which shouldn't be possible here:
// We shouldn't have an (enabled) cancel button at
// all then.
case wxProgressDialog::Uncancelable:
// This one was already dealt with above.
case wxProgressDialog::Finished:
// Normally it shouldn't be possible to get any
// notifications after switching to this state.
case wxProgressDialog::Dismissed:
wxFAIL_MSG( "unreachable" );
break;
}
}
return S_FALSE;