From a746a064aa125735fc529505850294bfd58e8cfd Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Sat, 4 Nov 2006 21:50:17 +0000
Subject: [PATCH] Fix cancel button of QSF import. Patch provided by Georgi
 Mirchev, bug#343723.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15083 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/gnome/druid-merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gnome/druid-merge.c b/src/gnome/druid-merge.c
index a0515a70d7..d9fa22f5e7 100644
--- a/src/gnome/druid-merge.c
+++ b/src/gnome/druid-merge.c
@@ -181,8 +181,8 @@ on_import_next (GnomeDruidPage  *gnomedruidpage,
 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);