diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-13 14:24:01 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-12-13 14:22:28 +0100 |
commit | 0fa14d58457e9418ff756a0efd66e365c4403a67 (patch) | |
tree | bc399a39f873885743edafd739232b2cd8fb0c49 /svtools | |
parent | 340edbc5431293469ff2416b8f7f695508b07470 (diff) |
tdf#121180: close Options dialog when restart is confirmed
Change-Id: Ieb6e62ca83921abed6b6432d70c6717dadfaaa34
Reviewed-on: https://gerrit.libreoffice.org/65090
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/dialogs/restartdialog.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 460267c2dde3..4ec3356276bb 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -93,18 +93,20 @@ IMPL_LINK_NOARG(RestartDialog, hdlNo, weld::Button&, void) } -void svtools::executeRestartDialog( +bool svtools::executeRestartDialog( css::uno::Reference< css::uno::XComponentContext > const & context, weld::Window* parent, RestartReason reason) { auto xRestartManager = css::task::OfficeRestartManager::get(context); if (xRestartManager->isRestartRequested(false)) - return; // don't try to show another dialog when restart is already in progress + return true; // don't try to show another dialog when restart is already in progress RestartDialog aDlg(parent, reason); if (aDlg.run()) { xRestartManager->requestRestart( css::uno::Reference< css::task::XInteractionHandler >()); + return true; } + return false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |