diff libgui/src/settings-dialog.h @ 19698:ff56a9899101

fix new shortcut dialog when applying new settings (fix #44196) * settings-dialog.cc (write_changed_settings): new boolean parameter whether settings dialog is closing or not, calling function for writing the shortcuts with this parameter; (button_clicked): calling write_changed_settings with new flag set to false when button with accept role was clicked * settings-dialog.h: write_changed_settings with boolean parameter * shortcut-manager.cc (do_write_shortcuts): delete shortcut dialog only if settings dialog is closing, setting to 0 after deletion; (do_import_export): call do_write_shortcuts with new flag * shortcut-manager.h: do_/write_shortcuts with new boolean parameter
author Torsten <ttl@justmail.de>
date Fri, 06 Feb 2015 22:55:01 +0100
parents 101ce4eaa56c
children 4197fc428c7d
line wrap: on
line diff
--- a/libgui/src/settings-dialog.h	Fri Feb 06 13:06:54 2015 -0500
+++ b/libgui/src/settings-dialog.h	Fri Feb 06 22:55:01 2015 +0100
@@ -74,7 +74,7 @@
          MaxStyleNumber = 128 };
 #endif
 
-  void write_changed_settings ();
+  void write_changed_settings (bool closing);
 
   void read_workspace_colors (QSettings *settings);
   void write_workspace_colors (QSettings *settings);