commit dfa1f1f872c418e89757a3985979b79e94c12fcc
author Xisco Fauli <xiscofauli@libreoffice.org> Mon Jan 21 17:00:52 2019 +0100
committer Xisco Faulí <xiscofauli@libreoffice.org> Tue Jan 22 17:50:48 2019 +0100
tree 56816fc5aae0254cdcbdafb02ceb3fcb897ee275
parent 273330a55d7cf457da6d7ba9829527a961c40bc0

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@collabora.com>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/66732
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>

cui/source/options/optgdlg.cxx

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index bd244c7..bd97029 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -958,9 +958,10 @@
        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;

cui/source/options/optinet2.cxx

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 8124c7d..4d32aea 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -803,7 +803,8 @@
    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);
    }
}