[Gnucash-changes] r14362 - gnucash/trunk - Do a better job of turning the busy cursor on/off. Now works

[David Hampton]

Author: hampton
Date: 2006-06-14 00:16:16 -0400 (Wed, 14 Jun 2006)
New Revision: 14362
Trac: http://svn.gnucash.org/trac/changeset/14362

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
Log:
Do a better job of turning the busy cursor on/off.  Now works
correctly if there's a failure in the input file.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-06-14 03:42:07 UTC (rev 14361)
+++ gnucash/trunk/ChangeLog	2006-06-14 04:16:16 UTC (rev 14362)
@@ -1,5 +1,9 @@
 2006-06-13  David Hampton  <hampton at employees.org>
 
+	* src/import-export/qif-import/druid-qif-import.c: Do a better job
+	of turning the busy cursor on/off.  Now works correctly if there's
+	a failure in the input file.
+
 	* src/core-utils/gnc-glib-utils.[ch]:
 	* src/core-utils/gw-core-utils-spec.scm:
 	* src/import-export/qif-import/qif-file.scm:

Modified: gnucash/trunk/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2006-06-14 03:42:07 UTC (rev 14361)
+++ gnucash/trunk/src/import-export/qif-import/druid-qif-import.c	2006-06-14 04:16:16 UTC (rev 14362)
@@ -492,6 +492,9 @@
     load_return = scm_call_4(qif_file_load, SCM_CAR(imported_files),
 			     scm_filename, wind->ticker_map, window);
     
+    /* turn back the cursor */
+    gnc_unset_busy_cursor(NULL);
+
     /* a list returned is (#f error-message) for an error, 
      * (#t error-message) for a warning, or just #f for an 
      * exception. */
@@ -527,6 +530,9 @@
       return TRUE;
     }
     else {
+      /* turn on the busy cursor */
+      gnc_set_busy_cursor(NULL, TRUE);
+
       /* call the field parser */
       parse_return = scm_call_1(qif_file_parse, SCM_CAR(imported_files));
       
@@ -569,6 +575,9 @@
 	}
       }
 
+      /* turn back the cursor */
+      gnc_unset_busy_cursor(NULL);
+
       /* Can this ever happen??? */
       if(parse_return == SCM_BOOL_F) {
         gnc_error_dialog(wind->window,
@@ -596,9 +605,6 @@
     wind->imported_files = imported_files;
     scm_gc_protect_object(wind->imported_files);
     
-    /* turn back the cursor */
-    gnc_unset_busy_cursor(NULL);
-
     if(ask_date_format) {
       /* we need to get a date format, so go to the next page */
       return gnc_ui_qif_import_generic_next_cb(page, arg1, wind);