diff options
Diffstat (limited to 'vcl/source/window/dialog.cxx')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 3bba7d2fc787..14ea8dae4fdc 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -1109,6 +1109,12 @@ void Dialog::EndDialog( long nResult ) if ( mpDialogImpl && mpDialogImpl->maEndCtx.isSet() ) { auto fn = std::move(mpDialogImpl->maEndCtx.maEndDialogFn); + // std::move leaves maEndDialogFn in a valid state with unspecified + // value. For the SwSyncBtnDlg case gcc and msvc left maEndDialogFn + // unset, but clang left maEndDialogFn at its original value, keeping + // an extra reference to the DialogController in its lambda giving + // an inconsistent lifecycle for the dialog. Force it to be unset. + mpDialogImpl->maEndCtx.maEndDialogFn = nullptr; fn(nResult); } |