commit 72e242267b8415b55b3de0d01201ee04a1f7d76b
Author: Juergen Spitzmueller <sp...@lyx.org>
Date:   Sun Oct 15 11:20:49 2023 +0200

    Only apply ui_style if it has changed
---
 src/frontends/qt/GuiPrefs.cpp |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index e72baf8..a0c28e4 100644
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -2536,15 +2536,17 @@ void PrefUserInterface::applyRC(LyXRC & rc) const
 
        QString const uistyle = uiStyleCO->itemData(
                uiStyleCO->currentIndex()).toString();
-       rc.ui_style = fromqstr(uistyle);
-       if (rc.ui_style == "default")
-               // FIXME: This should work with 
frontend::GuiApplication::setStyle(QString())
-               //        Qt bug https://bugreports.qt.io/browse/QTBUG-58268
-               frontend::Alert::warning(_("Restart needed"),
-                                        _("Resetting the user interface style 
to 'Default'"
-                                          " requires a restart of LyX."));
-       else
-               frontend::GuiApplication::setStyle(uistyle);
+       if (rc.ui_style != fromqstr(uistyle)) {
+               rc.ui_style = fromqstr(uistyle);
+               if (rc.ui_style == "default")
+                       // FIXME: This should work with 
frontend::GuiApplication::setStyle(QString())
+                       //        Qt bug 
https://bugreports.qt.io/browse/QTBUG-58268
+                       frontend::Alert::warning(_("Restart needed"),
+                                                _("Resetting the user 
interface style to 'Default'"
+                                                  " requires a restart of 
LyX."));
+               else
+                       frontend::GuiApplication::setStyle(uistyle);
+       }
 
        rc.ui_file = internal_path(fromqstr(uiFileED->text()));
        rc.use_system_theme_icons = useSystemThemeIconsCB->isChecked();
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

Reply via email to