dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fixing issue where the selected_ratio_button assert was being checked before being corrected for out-of-bounds values. Also fixed issue where the button id was assumed to be the index but it's actually a free-mapping. Changed mapped keys to be actual button index. (#3428)

Browse source
This commit is contained in:
clemahieu 2021-08-31 18:32:28 +01:00 • committed by GitHub
commit db6c1624c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
nano/qt/qt.cpp
View file

@ -1765,9 +1765,9 @@ nano_qt::advanced_actions::advanced_actions (nano_qt::wallet & wallet_a) :
wallet (wallet_a) wallet (wallet_a)
{ {
ratio_group->addButton (nano_unit); ratio_group->addButton (nano_unit);
ratio_group->setId (nano_unit, ratio_group->buttons ().size () - 1);
ratio_group->addButton (raw_unit); ratio_group->addButton (raw_unit);
ratio_group->setId (nano_unit, 2); ratio_group->setId (raw_unit, ratio_group->buttons ().size () - 1);
ratio_group->setId (raw_unit, 3);
scale_layout->addWidget (scale_label); scale_layout->addWidget (scale_label);
scale_layout->addWidget (nano_unit); scale_layout->addWidget (nano_unit);
scale_layout->addWidget (raw_unit); scale_layout->addWidget (raw_unit);
@ -1825,35 +1825,25 @@ nano_qt::advanced_actions::advanced_actions (nano_qt::wallet & wallet_a) :
QObject::connect (nano_unit, &QRadioButton::toggled, [this] () { QObject::connect (nano_unit, &QRadioButton::toggled, [this] () {
if (nano_unit->isChecked ()) if (nano_unit->isChecked ())
{ {
QSettings ().setValue (saved_ratio_key, ratio_group->id (nano_unit));
this->wallet.change_rendering_ratio (nano::Mxrb_ratio); this->wallet.change_rendering_ratio (nano::Mxrb_ratio);
QSettings ().setValue (saved_ratio_key, ratio_group->id (nano_unit));
} }
}); });
QObject::connect (raw_unit, &QRadioButton::toggled, [this] () { QObject::connect (raw_unit, &QRadioButton::toggled, [this] () {
if (raw_unit->isChecked ()) if (raw_unit->isChecked ())
{ {
QSettings ().setValue (saved_ratio_key, ratio_group->id (raw_unit));
this->wallet.change_rendering_ratio (nano::raw_ratio); this->wallet.change_rendering_ratio (nano::raw_ratio);
QSettings ().setValue (saved_ratio_key, ratio_group->id (raw_unit));
} }
}); });
auto selected_ratio_id (QSettings ().value (saved_ratio_key, ratio_group->id (nano_unit)).toInt ()); auto selected_ratio_button = ratio_group->button (QSettings ().value (saved_ratio_key).toInt ());
auto selected_ratio_button = ratio_group->button (selected_ratio_id); if (selected_ratio_button == nullptr)
{
selected_ratio_button = nano_unit;
}
debug_assert (selected_ratio_button != nullptr); debug_assert (selected_ratio_button != nullptr);
selected_ratio_button->click ();
// Make sure value is not out of bounds QSettings ().setValue (saved_ratio_key, ratio_group->id (selected_ratio_button));
if (selected_ratio_id < 0 || selected_ratio_id > 1)
{
QSettings ().setValue (saved_ratio_key, 0);
selected_ratio_id = 0;
}
if (selected_ratio_button)
{
selected_ratio_button->click ();
}
else
{
nano_unit->click ();
}
QObject::connect (wallet_refresh, &QPushButton::released, [this] () { QObject::connect (wallet_refresh, &QPushButton::released, [this] () {
this->wallet.accounts.refresh (); this->wallet.accounts.refresh ();
this->wallet.accounts.refresh_wallet_balance (); this->wallet.accounts.refresh_wallet_balance ();