[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-0' - cui/source

[Libreoffice Gerrit user]

 cui/source/options/optgdlg.cxx  |    7 ++++---
 cui/source/options/optinet2.cxx |    3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 517470b908518fe19661f6337295d75e09dac80e
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Mon Jan 21 17:00:52 2019 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Jan 23 17:02:13 2019 +0100

    tdf#122846: Close option dialog if restart is confirmed
    
    use the same logic as 0fa14d58457e9418ff756a0efd66e365c4403a67
    
    Change-Id: I485cb232bb787e176918caf2eee74b0fbb360e47
    Reviewed-on: https://gerrit.libreoffice.org/66691
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/66733
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index bc2510fb8e7a..e13da9007438 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -958,9 +958,10 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
         m_pForceOpenGL->IsValueChangedFromSaved())
     {
         SolarMutexGuard aGuard;
-        svtools::executeRestartDialog(
-            comphelper::getProcessComponentContext(), nullptr,
-            svtools::RESTART_REASON_OPENGL);
+        if( svtools::executeRestartDialog(
+                comphelper::getProcessComponentContext(), nullptr,
+                svtools::RESTART_REASON_OPENGL))
+            GetParentDialog()->EndDialog(RET_OK);
     }
 
     return bModified;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 8124c7d8998c..4d32aea2ebb4 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -803,7 +803,8 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, Button*, void)
     if (nRet == RET_OK && sOrig != mpCertPathDlg->getDirectory())
     {
         SolarMutexGuard aGuard;
-        svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_ADDING_PATH);
+        if (svtools::executeRestartDialog(comphelper::getProcessComponentContext(), nullptr, svtools::RESTART_REASON_ADDING_PATH))
+            GetParentDialog()->EndDialog(RET_OK);
     }
 }