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

[Libreoffice Gerrit user]

 cui/source/options/optgdlg.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 6ba08959ab0e70a3dd50a4a88134ccf7a18710ca
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Jan 24 10:13:18 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Mon Jan 28 12:05:05 2019 +0100

    tdf#122912: Close option dialog if restart is confirmed ( part 2 )
    
    forgot it in e961e08a3277158d4e3074bfacb8599296d2fa75
    
    Change-Id: Id896bf407ca33faf0dbff74f3cbe98d23de0e0c7
    Reviewed-on: https://gerrit.libreoffice.org/66846
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit c81340bcc73144e082efb9fc575ef62b9b046ca4)
    Reviewed-on: https://gerrit.libreoffice.org/66870
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index bd9702902e6d..535262f022a8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1393,9 +1393,10 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
             Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
             // display info
             SolarMutexGuard aGuard;
-            svtools::executeRestartDialog(
-                comphelper::getProcessComponentContext(), GetFrameWeld(),
-                svtools::RESTART_REASON_LANGUAGE_CHANGE);
+            if (svtools::executeRestartDialog(
+                    comphelper::getProcessComponentContext(), GetFrameWeld(),
+                    svtools::RESTART_REASON_LANGUAGE_CHANGE))
+                GetParentDialog()->EndDialog(RET_OK);
 
             // tell quickstarter to stop being a veto listener