IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[HBCI] Fix crashing aqbanking balance download and import

Browse Source 
Also, clarify the preconditions of the import-matcher functions.
Follow-up to d4fe584120
This commit is contained in:
Christian Stimming 2020-09-20 21:04:16 +02:00
parent 3d7e66d995
commit 64dedccfe3
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnucash/import-export/aqb/gnc-ab-utils.c
View File

@ -1245,7 +1245,8 @@ gnc_ab_import_context(AB_IMEXPORTER_CONTEXT *context,
data); data);
/* populate and display the matching window */ /* populate and display the matching window */
gnc_gen_trans_list_show_all(data->generic_importer); if (data->generic_importer)
gnc_gen_trans_list_show_all(data->generic_importer);
/* Check balances */ /* Check balances */
if (!(awaiting & IGNORE_BALANCES)) if (!(awaiting & IGNORE_BALANCES))
@ -1258,7 +1259,8 @@ gnc_ab_import_context(AB_IMEXPORTER_CONTEXT *context,
data); data);
/* populate and display the matching window */ /* populate and display the matching window */
gnc_gen_trans_list_show_all(data->generic_importer); if (data->generic_importer)
gnc_gen_trans_list_show_all(data->generic_importer);
/* Check balances */ /* Check balances */
if (!(awaiting & IGNORE_BALANCES)) if (!(awaiting & IGNORE_BALANCES))

5
gnucash/import-export/import-main-matcher.c
View File

@ -388,6 +388,7 @@ resolve_conflicts (GNCImportMainMatcher *info)
void gnc_gen_trans_list_show_all(GNCImportMainMatcher *info) void gnc_gen_trans_list_show_all(GNCImportMainMatcher *info)
{ {
g_assert (info);
gnc_gen_trans_list_create_matches (info); gnc_gen_trans_list_create_matches (info);
resolve_conflicts (info); resolve_conflicts (info);
gtk_widget_show_all (GTK_WIDGET (info->main_widget)); gtk_widget_show_all (GTK_WIDGET (info->main_widget));
@ -1807,7 +1808,9 @@ gnc_gen_trans_list_create_matches (GNCImportMainMatcher *gui)
GHashTable* account_hash = GHashTable* account_hash =
g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL,
(GDestroyNotify)g_slist_free); (GDestroyNotify)g_slist_free);
GList *candidate_txns = query_imported_transaction_accounts (gui); GList *candidate_txns;
g_assert (gui);
candidate_txns = query_imported_transaction_accounts (gui);
create_hash_of_potential_matches (candidate_txns, account_hash); create_hash_of_potential_matches (candidate_txns, account_hash);
perform_matching (gui, account_hash); perform_matching (gui, account_hash);