r23349 - gnucash/trunk/src/gnome-utils - On file open, only destroy a previous session if really exists

[Geert Janssens]

Author: gjanssens
Date: 2013-10-29 15:25:52 -0400 (Tue, 29 Oct 2013)
New Revision: 23349
Trac: http://svn.gnucash.org/trac/changeset/23349

Modified:
   gnucash/trunk/src/gnome-utils/gnc-file.c
Log:
On file open, only destroy a previous session if really exists

Modified: gnucash/trunk/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-file.c	2013-10-29 19:25:42 UTC (rev 23348)
+++ gnucash/trunk/src/gnome-utils/gnc-file.c	2013-10-29 19:25:52 UTC (rev 23349)
@@ -701,11 +701,14 @@
 
     /* -------------- BEGIN CORE SESSION CODE ------------- */
     /* -- this code is almost identical in FileOpen and FileSaveAs -- */
-    current_session = gnc_get_current_session();
-    qof_session_call_close_hooks(current_session);
-    gnc_hook_run(HOOK_BOOK_CLOSED, current_session);
-    gnc_close_gui_component_by_session (current_session);
-    gnc_clear_current_session();
+    if (gnc_current_session_exist())
+    {
+        current_session = gnc_get_current_session();
+        qof_session_call_close_hooks(current_session);
+        gnc_hook_run(HOOK_BOOK_CLOSED, current_session);
+        gnc_close_gui_component_by_session (current_session);
+        gnc_clear_current_session();
+    }
 
     /* load the accounts from the users datafile */
     /* but first, check to make sure we've got a session going. */