gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e01a2a64 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5642f023 (commit)
	from  https://github.com/Gnucash/gnucash/commit/1365a19e (commit)



commit e01a2a64384c524b72796e11b4a8a4d582cabdb8
Merge: 1365a19e2 5642f0236
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Apr 13 11:57:57 2020 -0700

    Merge Jean Laroche's '797114_Delet_Account' into maint.


commit 5642f0236d3013054e64385cfabd465e76842546
Author: jean <you at example.com>
Date:   Sun Apr 12 12:20:47 2020 -0700

    Bug 797114 - Fixing an SX due to deleted account stuck in an error loop

diff --git a/gnucash/gnome/dialog-sx-editor.c b/gnucash/gnome/dialog-sx-editor.c
index 1b1d423c7..2f2c7c439 100644
--- a/gnucash/gnome/dialog-sx-editor.c
+++ b/gnucash/gnome/dialog-sx-editor.c
@@ -644,7 +644,8 @@ gnc_sxed_split_check_account (GncSxEditorDialog *sxed, Split *s,
                       NULL);
     acct = xaccAccountLookup (acct_guid, gnc_get_current_book ());
     guid_free (acct_guid);
-    if (acct == NULL)
+    // If the split is being destroyed always return TRUE.
+    if (acct == NULL && !qof_instance_get_destroying(s))
         return FALSE;
     split_cmdty = xaccAccountGetCommodity(acct);
     split_amount = xaccSplitGetAmount(s);



Summary of changes:
 gnucash/gnome/dialog-sx-editor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)