callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: make sure we reset tool modifier state before saving options.

Browse Source 
I had this funny behavior when I was quitting GIMP with the active tool
using modifiers (for instance bucket fill). Each time I'd quit with
ctrl-q (and if the image is not dirty), the options would use the value
from the modifier state and be saved as-is. Hence at next restart, the
default value was always different!

(cherry picked from commit dd3d9ab3dd)
This commit is contained in:
Jehan
2018-11-22 16:17:19 +01:00
parent 19c1f2654e
commit 706fe079c2
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/gui/gui.c
View File

@ -45,6 +45,8 @@
#include "display/gimpstatusbar.h" #include "display/gimpstatusbar.h"
#include "tools/gimp-tools.h" #include "tools/gimp-tools.h"
#include "tools/gimptool.h"
#include "tools/tool_manager.h"
#include "widgets/gimpaction-history.h" #include "widgets/gimpaction-history.h"
#include "widgets/gimpclipboard.h" #include "widgets/gimpclipboard.h"
@ -735,7 +737,8 @@ static gboolean
gui_exit_callback (Gimp *gimp, gui_exit_callback (Gimp *gimp,
gboolean force) gboolean force)
{ {
GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (gimp->config); GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (gimp->config);
GimpTool *active_tool;
if (gimp->be_verbose) if (gimp->be_verbose)
g_print ("EXIT: %s\n", G_STRFUNC); g_print ("EXIT: %s\n", G_STRFUNC);
@ -758,6 +761,15 @@ gui_exit_callback (Gimp *gimp,
gui_unique_exit (); gui_unique_exit ();
/* If any modifier is set when quitting (typically when exiting with
* Ctrl-q for instance!), when serializing the tool options, it will
* save any alternate value instead of the main one. Make sure that
* any modifier is reset before saving options.
*/
active_tool = tool_manager_get_active (gimp);
if (active_tool && active_tool->focus_display)
gimp_tool_set_modifier_state (active_tool, 0, active_tool->focus_display);
if (gui_config->save_session_info) if (gui_config->save_session_info)
session_save (gimp, FALSE); session_save (gimp, FALSE);