[gimp] app: gimp_tools_exit(): destroy the tool manager before the tool options
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: gimp_tools_exit(): destroy the tool manager before the tool options
- Date: Thu, 29 Jun 2017 11:00:27 +0000 (UTC)
commit 5e08d71437a77ddab5c3d3a49e249c850b9c9cf0
Author: Michael Natterer <mitch gimp org>
Date: Thu Jun 29 12:58:03 2017 +0200
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.
app/tools/gimp-tools.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/app/tools/gimp-tools.c b/app/tools/gimp-tools.c
index 1418faf..5474fd7 100644
--- a/app/tools/gimp-tools.c
+++ b/app/tools/gimp-tools.c
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]