diff options
| author |  bunnei | 2021-05-03 16:04:28 -0700 |
|---|---|---|
| committer |  GitHub | 2021-05-03 16:04:28 -0700 |
| commit | df51eb9bdec5be189e0662ab81bc29277f3da343 (patch) | |
| tree | dc1a5cf937fe77ccabb8dab97b5e9a5af9758c27 /src/core/tools/freezer.cpp | |
| parent | Merge pull request #6275 from german77/mousefocus (diff) | |
| parent | core: Resolve misc cases of variable shadowing (diff) | |
| download | yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.gz yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.tar.xz yuzu-df51eb9bdec5be189e0662ab81bc29277f3da343.zip | |
Merge pull request #6278 from lioncash/misc-shadow
core: Resolve misc straggler cases of variable shadowing
Diffstat (limited to 'src/core/tools/freezer.cpp')
| -rw-r--r-- | src/core/tools/freezer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/tools/freezer.cpp b/src/core/tools/freezer.cpp index 5c674a099..2e09faa6d 100644 --- a/src/core/tools/freezer.cpp +++ b/src/core/tools/freezer.cpp | |||
| @@ -67,8 +67,8 @@ Freezer::~Freezer() { | |||
| 67 | core_timing.UnscheduleEvent(event, 0); | 67 | core_timing.UnscheduleEvent(event, 0); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | void Freezer::SetActive(bool active) { | 70 | void Freezer::SetActive(bool is_active) { |
| 71 | if (!this->active.exchange(active)) { | 71 | if (!active.exchange(is_active)) { |
| 72 | FillEntryReads(); | 72 | FillEntryReads(); |
| 73 | core_timing.ScheduleEvent(memory_freezer_ns, event); | 73 | core_timing.ScheduleEvent(memory_freezer_ns, event); |
| 74 | LOG_DEBUG(Common_Memory, "Memory freezer activated!"); | 74 | LOG_DEBUG(Common_Memory, "Memory freezer activated!"); |