r15282 - gnucash/branches/2.0 - Avoid crash when renaming page in a page-less window by returning if

Derek Atkins warlord at cvs.gnucash.org
Sat Dec 30 14:45:20 EST 2006


Author: warlord
Date: 2006-12-30 14:45:19 -0500 (Sat, 30 Dec 2006)
New Revision: 15282
Trac: http://svn.gnucash.org/trac/changeset/15282

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/ChangeLog
   gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c
Log:
Avoid crash when renaming page in a page-less window by returning if
there is no current page. Fixes #388841.

Merge from r15249



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:13799
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:13800
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/ChangeLog
===================================================================
--- gnucash/branches/2.0/ChangeLog	2006-12-30 19:45:02 UTC (rev 15281)
+++ gnucash/branches/2.0/ChangeLog	2006-12-30 19:45:19 UTC (rev 15282)
@@ -1,3 +1,8 @@
+2006-12-30  Andreas Köhler  <andi5.py at gmx.net>
+
+	* Avoid crash when renaming page in a page-less window by returning if
+	  there is no current page. Fixes #388841.
+
 2006-12-30  Derek Atkins  <derek at ihtfp.com>
 
 	* Load and store a commodity's KVP-frame (IFF it's non-empty).

Modified: gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c	2006-12-30 19:45:02 UTC (rev 15281)
+++ gnucash/branches/2.0/src/gnome-utils/gnc-main-window.c	2006-12-30 19:45:19 UTC (rev 15282)
@@ -2960,6 +2960,11 @@
   ENTER(" ");
   priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
   page = priv->current_page;
+  if (!page) {
+    LEAVE("No current page");
+    return;
+  }
+  
   tab_hbox = gtk_notebook_get_tab_label(GTK_NOTEBOOK(priv->notebook),
                                        page->notebook_page);
   children = gtk_container_get_children(GTK_CONTAINER(tab_hbox));



More information about the gnucash-changes mailing list