Skip to content

Commit e1ea148

Browse files
authored
Merge pull request moneymanagerex#8306 from KWich/Fix-2026-04-10-II
Fix currency related crashes during new database creation
2 parents c975adc + db355f5 commit e1ea148

3 files changed

Lines changed: 190 additions & 178 deletions

File tree

src/dialog/CurrencyChoiceDialog.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ CurrencyChoiceDialog::CurrencyChoiceDialog(
8181
m_col_name_m[BASE_RATE] = m_history_en ? _t("Last Rate") : _t("Fixed Rate");
8282

8383
m_currency_id = currencyID == -1 ? PrefModel::instance().getBaseCurrencyID() : currencyID;
84-
this->SetFont(parent->GetFont());
84+
if (parent) {
85+
this->SetFont(parent->GetFont());
86+
}
8587
Create(parent);
8688
m_select_en ? SetMinSize(wxSize(200, 350)) : SetMinSize(wxSize(500, 350));
8789
mmSetSize(this);
@@ -414,7 +416,7 @@ bool CurrencyChoiceDialog::Execute(wxWindow* parent, int64& currencyID)
414416

415417
bool CurrencyChoiceDialog::Execute(int64& currencyID)
416418
{
417-
CurrencyChoiceDialog dlg(nullptr, currencyID);
419+
CurrencyChoiceDialog dlg(NULL, currencyID);
418420
dlg.m_static_dialog = true;
419421
dlg.SetTitle(_t("Base Currency Selection"));
420422
dlg.w_history_list->Enable(false);

0 commit comments

Comments
 (0)