Skip to content

Commit c5f2fe6

Browse files
committed
fix 'Track as %' not being checked when opening an active achievement using it
1 parent 4f2ff6a commit c5f2fe6

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/ui/viewmodels/TriggerViewModel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ void TriggerViewModel::InitializeGroups(const rc_trigger_t& pTrigger)
402402
m_vGroups.RemoveNotifyTarget(*this);
403403
m_vGroups.BeginUpdate();
404404

405-
SetMeasuredTrackedAsPercent(m_pTrigger != nullptr ? m_pTrigger->measured_as_percent : false);
405+
SetMeasuredTrackedAsPercent(pTrigger.measured_as_percent);
406406

407407
// this will not update the conditions collection because OnValueChange ignores it when m_vGroups.IsUpdating
408408
SetSelectedGroupIndex(0);

tests/ui/viewmodels/TriggerViewModel_Tests.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,8 @@ TEST_CLASS(TriggerViewModel_Tests)
233233
ParseAndRegenerate("0xH1234=0xH2345"); // one condition
234234
ParseAndRegenerate("0xH1234=0xH2345_0xX5555=1.3._R:0x face=678"); // several conditions
235235
ParseAndRegenerate("I:0x 1234_A:0xH2345_0xH7777=345"); // addsource/addaddress chain
236+
ParseAndRegenerate("M:0xH1234>3"); // measured (not as percent)
237+
ParseAndRegenerate("Q:0xH1234>3"); // measured (as percent)
236238
}
237239

238240
TEST_METHOD(TestParseAndRegenerateWithAlts)

0 commit comments

Comments
 (0)