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

Change the reldate_values alist from a static to a singleton.

Browse Source 
A static has to be initialized at library load and Guile
isn't necessarily running then. The singleton gets evaluated at
runtime only if the getter is called from Guile.
This commit is contained in:
John Ralls 2021-02-25 10:40:18 -08:00
parent 534a7c2893
commit 9bd3baff63
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libgnucash/app-utils/gnc-optiondb.i
View File

@ -464,7 +464,12 @@ wrap_unique_ptr(GncOptionDBPtr, GncOptionDB);
%typemap(out) GncOption* "$result = ($1) ? scm_from_pointer($1, nullptr) : SCM_BOOL_F;"
%header %{
static const SCM reldate_values = scm_c_eval_string(
static const SCM get_reldate_values() {
static SCM reldate_values = SCM_BOOL_F;
if (scm_is_false(reldate_values))
reldate_values = scm_c_eval_string(
"'((absolute RelativeDatePeriod-ABSOLUTE)"
"(today RelativeDatePeriod-TODAY)"
"(one-week-ago RelativeDatePeriod-ONE-WEEK-AGO)"
@ -626,7 +631,8 @@ wrap_unique_ptr(GncOptionDBPtr, GncOptionDB);
{
if (!$self)
return;
std::visit([new_value](auto& option) {
auto reldate_values{get_reldate_values()};
std::visit([new_value, reldate_values](auto& option) {
if constexpr (std::is_same_v<std::decay_t<decltype(option)>,
GncOptionDateValue>)
{