summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-12-13 14:24:01 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-12-13 14:22:28 +0100
commit0fa14d58457e9418ff756a0efd66e365c4403a67 (patch)
treebc399a39f873885743edafd739232b2cd8fb0c49 /cui
parent340edbc5431293469ff2416b8f7f695508b07470 (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 'cui')
-rw-r--r--cui/source/options/treeopt.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 0a2aa20f6885..435fd0acb04c 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -696,8 +696,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ApplyHdl_Impl, Button*, void)
if ( bNeedsRestart )
{
SolarMutexGuard aGuard;
- ::svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
- GetFrameWeld(), eRestartReason);
+ if (svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
+ GetFrameWeld(), eRestartReason))
+ EndDialog(RET_OK);
}
}