mirror of https://github.com/GNOME/gimp.git
app: gimp_tools_exit(): destroy the tool manager before the tool options
The tool manager still keeps an active tool which it unrefs on destruction, triggering a final HALT on the tool, which may want to lookup tool options to reset something. Happened with the new widget-ported rectangle select tool.
This commit is contained in:
parent
8bf20a6c21
commit
5e08d71437
|
@ -231,6 +231,8 @@ gimp_tools_exit (Gimp *gimp)
|
|||
|
||||
g_object_set_data (G_OBJECT (gimp), "gimp-tools-default-order", NULL);
|
||||
|
||||
tool_manager_exit (gimp);
|
||||
|
||||
for (list = gimp_get_tool_info_iter (gimp);
|
||||
list;
|
||||
list = g_list_next (list))
|
||||
|
@ -242,8 +244,6 @@ gimp_tools_exit (Gimp *gimp)
|
|||
gtk_widget_destroy (options_gui);
|
||||
gimp_tools_set_tool_options_gui (tool_info->tool_options, NULL);
|
||||
}
|
||||
|
||||
tool_manager_exit (gimp);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in New Issue