r15965 - gnucash/branches/2.0 - Disable the close callback while updating reports. Fixes #416986.

[Derek Atkins]

Author: warlord
Date: 2007-04-21 15:32:04 -0400 (Sat, 21 Apr 2007)
New Revision: 15965
Trac: http://svn.gnucash.org/trac/changeset/15965

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/gnome-utils/dialog-options.c
Log:
Disable the close callback while updating reports.  Fixes #416986.

Merge from r15959



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:14585
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:697
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:14599
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2007-04-21 19:19:22 UTC (rev 15964)
+++ gnucash/branches/2.0/ChangeLog	2007-04-21 19:32:04 UTC (rev 15965)
@@ -1,3 +1,7 @@
+2007-04-21  David Hampton  <hampton at employees.org>
+
+	* Disable the close callback while updating reports.  Fixes #416986.
+
 2007-04-21  Andreas Köhler  <andi5.py at gmx.net>
 
 	* Use correct mnemonic widget for "_Parent Account" in account dialog

Modified: gnucash/branches/2.0/src/gnome-utils/dialog-options.c
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/dialog-options.c	2007-04-21 19:19:22 UTC (rev 15964)
+++ gnucash/branches/2.0/src/gnome-utils/dialog-options.c	2007-04-21 19:32:04 UTC (rev 15965)
@@ -1314,6 +1314,8 @@
 void
 gnc_options_dialog_response_cb(GtkDialog *dialog, gint response, GNCOptionWin *window)
 {
+  GNCOptionWinCallback close_cb;
+
   switch (response) {
    case GTK_RESPONSE_HELP:
     if(window->help_cb)
@@ -1323,8 +1325,11 @@
    case GTK_RESPONSE_OK:
    case GTK_RESPONSE_APPLY:
     gnc_options_dialog_changed_internal (window->dialog, FALSE);
+    close_cb = window->close_cb;
+    window->close_cb = NULL;
     if (window->apply_cb)
       window->apply_cb (window, window->apply_cb_data);
+    window->close_cb = close_cb;
     if (response == GTK_RESPONSE_APPLY)
       break;
     /* fall through */