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

[Tor Lillqvist]

 cui/source/options/optopencl.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit aaeeb0288dfeeeed9beb33efc0a693bc1a025986
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jun 27 10:28:55 2016 +0300

    tdf#100222: Show the dialog just once even if both toggles were changed
    
    Change-Id: If6058d68f80ebc3e235f0a681cfe3240985e2429
    Reviewed-on: https://gerrit.libreoffice.org/26693
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 6f01523..52c8b08 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -155,9 +155,6 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
     {
         officecfg::Office::Common::Misc::UseSwInterpreter::set(mpUseSwInterpreter->IsChecked(), batch);
         bModified = true;
-
-        ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO);
-        aWarnBox->Execute();
     }
 
     if (mpUseOpenCL->IsValueChangedFromSaved())
@@ -167,13 +164,14 @@ bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
     {
         maConfig.set();
         bModified = true;
-
-        ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO);
-        aWarnBox->Execute();
     }
 
     if (bModified)
+    {
+        ScopedVclPtrInstance<MessageDialog> aWarnBox(this, CUI_RES(RID_SVXSTR_OPTIONS_RESTART), VCL_MESSAGE_INFO);
+        aWarnBox->Execute();
         batch->commit();
+    }
 
     return bModified;
 }