r15083 - gnucash/trunk/src/gnome - Fix cancel button of QSF import. Patch provided by Georgi Mirchev, bug#343723.

[Christian Stimming]

Author: cstim
Date: 2006-11-04 16:50:17 -0500 (Sat, 04 Nov 2006)
New Revision: 15083
Trac: http://svn.gnucash.org/trac/changeset/15083

Modified:
   gnucash/trunk/src/gnome/druid-merge.c
Log:
Fix cancel button of QSF import. Patch provided by Georgi Mirchev, bug#343723.

Modified: gnucash/trunk/src/gnome/druid-merge.c
===================================================================
--- gnucash/trunk/src/gnome/druid-merge.c	2006-11-03 20:51:02 UTC (rev 15082)
+++ gnucash/trunk/src/gnome/druid-merge.c	2006-11-04 21:50:17 UTC (rev 15083)
@@ -181,8 +181,8 @@
 static void
 on_merge_cancel (GnomeDruid *gnomedruid, gpointer user_data)
 {
+	g_return_if_fail(mergeBook != NULL);
 	gnc_suspend_gui_refresh ();
-	g_return_if_fail(mergeData != NULL);
 	delete_merge_window();
 	qof_book_destroy(mergeBook);
 	qof_session_end(merge_session);