From 9be9b4072741ac3c7282f272484df1f65aa2765e Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Thu, 13 Dec 2018 14:24:01 +0300 Subject: tdf#121180: close Options dialog when restart is confirmed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ieb6e62ca83921abed6b6432d70c6717dadfaaa34 Reviewed-on: https://gerrit.libreoffice.org/65090 Reviewed-by: Caolán McNamara Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 0fa14d58457e9418ff756a0efd66e365c4403a67) Reviewed-on: https://gerrit.libreoffice.org/65184 Reviewed-by: Xisco Faulí --- svtools/source/dialogs/restartdialog.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'svtools') diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 1de2e09cc014..079cc5e28f21 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -90,18 +90,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: */ -- cgit