[Gnucash-changes] r14495 - gnucash/trunk/src/register/ledger-core - Avoid crash from opening transaction in more than one register. Bug #347089.

[Chris Shoemaker]

Author: chris
Date: 2006-07-13 20:57:17 -0400 (Thu, 13 Jul 2006)
New Revision: 14495
Trac: http://svn.gnucash.org/trac/changeset/14495

Modified:
   gnucash/trunk/src/register/ledger-core/split-register-control.c
   gnucash/trunk/src/register/ledger-core/split-register.c
   gnucash/trunk/src/register/ledger-core/split-register.h
Log:
   Avoid crash from opening transaction in more than one register. Bug #347089.
   In any case where we might be opening the transaction and marking it as the 
   pending transaction, check first if it's already open.  If it is, we assume
   that it's being edited by another register.  We report the error and abort
   the action that would have opened the transaction.
BP


Modified: gnucash/trunk/src/register/ledger-core/split-register-control.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register-control.c	2006-07-13 23:15:33 UTC (rev 14494)
+++ gnucash/trunk/src/register/ledger-core/split-register-control.c	2006-07-14 00:57:17 UTC (rev 14495)
@@ -675,19 +675,17 @@
           return FALSE;
 
         /* now perform the completion */
-
-        gnc_suspend_gui_refresh ();
-
-        info->pending_trans_guid = *xaccTransGetGUID(trans);
         if ((pending_trans != NULL) && (pending_trans != trans)) {
+            if (gnc_split_register_begin_edit_or_warn(info, trans))
+                return TRUE;
+
             if (xaccTransIsOpen (pending_trans))
                 xaccTransCommitEdit (pending_trans);
             else g_assert_not_reached();
-            g_assert(!xaccTransIsOpen(trans));
-            xaccTransBeginEdit(trans);
         }
         g_assert(xaccTransIsOpen(trans));
         pending_trans = trans;
+        gnc_suspend_gui_refresh ();
 
         gnc_copy_trans_onto_trans (auto_trans, trans, FALSE, FALSE);
         blank_split = NULL;

Modified: gnucash/trunk/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.c	2006-07-13 23:15:33 UTC (rev 14494)
+++ gnucash/trunk/src/register/ledger-core/split-register.c	2006-07-14 00:57:17 UTC (rev 14495)
@@ -143,6 +143,24 @@
   return denom;
 }
 
+/* returns TRUE if begin_edit was aborted */
+gboolean
+gnc_split_register_begin_edit_or_warn(SRInfo *info, Transaction *trans)
+{
+      if (!xaccTransIsOpen(trans)) {
+          xaccTransBeginEdit(trans);
+          /* This is now the pending transaction */
+          info->pending_trans_guid = *xaccTransGetGUID(trans);
+          return FALSE;
+      } else {
+          GtkWidget *parent = NULL;
+          if (info->get_parent)
+              parent = info->get_parent(info->user_data);
+          gnc_error_dialog(parent, "%s", _("This transaction is already being edited in another register. Please finish editing it there first."));
+          return TRUE;
+      }
+}
+
 void
 gnc_split_register_expand_current_trans (SplitRegister *reg, gboolean expand)
 {
@@ -829,9 +847,8 @@
       g_assert(xaccTransIsOpen(trans));
   } else {
       g_assert(!pending_trans);
-      g_assert(!xaccTransIsOpen(trans));
-      xaccTransBeginEdit(trans);
-      info->pending_trans_guid = *xaccTransGetGUID(trans);
+      if (gnc_split_register_begin_edit_or_warn(info, trans))
+          return;
   }
   xaccSplitDestroy (split);
 
@@ -1001,10 +1018,8 @@
 
   trans = xaccSplitGetParent(split);
   if (!pending) {
-      g_assert(!xaccTransIsOpen(trans));
-      xaccTransBeginEdit(trans);
-      /* This is now the pending transaction */
-      info->pending_trans_guid = *xaccTransGetGUID(trans);
+      if (gnc_split_register_begin_edit_or_warn(info, trans))
+          return;
   } else if (pending == trans) {
       g_assert(xaccTransIsOpen(trans));
   } else g_assert_not_reached();
@@ -1351,15 +1366,12 @@
    if (gnc_split_register_handle_exchange (reg, FALSE))
      return TRUE;
 
-   gnc_suspend_gui_refresh ();
-
    /* determine whether we should commit the pending transaction */
    if (pending_trans != trans)
    {
        // FIXME: How could the pending transaction not be open?
        // FIXME: For that matter, how could an open pending
        // transaction ever not be the current trans?
-       info->pending_trans_guid = *xaccTransGetGUID(trans);
        if (xaccTransIsOpen (pending_trans)) {
            g_message("Impossible? commiting pending %p", pending_trans);
            xaccTransCommitEdit (pending_trans);
@@ -1371,10 +1383,13 @@
            g_assert(xaccTransIsOpen(blank_trans));
        } else {
            PINFO("beginning edit of trans %p", trans);
-           xaccTransBeginEdit (trans);
+           if (gnc_split_register_begin_edit_or_warn(info, trans))
+               return FALSE;
        }
        pending_trans = trans;
    }
+   g_assert(xaccTransIsOpen(trans));
+   gnc_suspend_gui_refresh ();
 
    /* If we are committing the blank split, add it to the account now */
    if (trans == blank_trans)

Modified: gnucash/trunk/src/register/ledger-core/split-register.h
===================================================================
--- gnucash/trunk/src/register/ledger-core/split-register.h	2006-07-13 23:15:33 UTC (rev 14494)
+++ gnucash/trunk/src/register/ledger-core/split-register.h	2006-07-14 00:57:17 UTC (rev 14495)
@@ -431,6 +431,10 @@
 gboolean
 gnc_split_register_handle_exchange (SplitRegister *reg, gboolean force_dialog);
 
+/* returns TRUE if begin_edit was aborted */
+gboolean
+gnc_split_register_begin_edit_or_warn(SRInfo *info, Transaction *trans);
+
 /** @} */
 /** @} */
 /* -------------------------------------------------------------- */