Merge branch 'maint'

This commit is contained in:
John Ralls
2022-06-14 12:53:16 -07:00
37 changed files with 2037 additions and 1981 deletions

View File

@@ -193,13 +193,15 @@ gnc_get_default_directory (const gchar *section)
gchar *dir;
dir = gnc_prefs_get_string (section, GNC_PREF_LAST_PATH);
if (!dir)
if (!(dir && *dir))
{
g_free (dir); // if it's ""
#ifdef G_OS_WIN32
dir = g_strdup (g_get_user_data_dir ()); /* equivalent of "My Documents" */
#else
dir = g_strdup (g_get_home_dir ());
#endif
}
return dir;
}
@@ -1040,7 +1042,8 @@ gnc_default_currency_common (gchar *requested_currency,
mnemonic = gnc_prefs_get_string(section, GNC_PREF_CURRENCY_OTHER);
currency = gnc_commodity_table_lookup(gnc_get_current_commodities(),
GNC_COMMODITY_NS_CURRENCY, mnemonic);
DEBUG("mnemonic %s, result %p", mnemonic ? mnemonic : "(null)", currency);
DEBUG("mnemonic %s, result %p",
mnemonic && *mnemonic ? mnemonic : "(null)", currency);
g_free(mnemonic);
}