diff options
| author | Mat M <mathew1800@gmail.com> | 2016-05-22 15:19:16 -0400 |
|---|---|---|
| committer | Mat M <mathew1800@gmail.com> | 2016-05-22 15:19:16 -0400 |
| commit | 08d45b9fea67714610cc6fdbe41e7bf1262816df (patch) | |
| tree | bd873fe49b79ecd9152523a98688749825f0b047 /Source/Core/DolphinWX/Debugger/WatchView.cpp | |
| parent | ff4bc5f33d6bfaab38d651b0706c77d705cf6c5c (diff) | |
| parent | c1944f623b5918ab45152795dea9e49f57878138 (diff) | |
Merge pull request #3794 from EmptyChaos/frame-advance-race
Core: Add synchronization to state changes (Fix Frame Step and FIFO Player - Issue 8718)
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/WatchView.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/WatchView.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Debugger/WatchView.cpp b/Source/Core/DolphinWX/Debugger/WatchView.cpp index ea79573f12..4f46c8aab2 100644 --- a/Source/Core/DolphinWX/Debugger/WatchView.cpp +++ b/Source/Core/DolphinWX/Debugger/WatchView.cpp @@ -7,6 +7,7 @@ #include <wx/menu.h> #include "Common/GekkoDisassembler.h" +#include "Core/Core.h" #include "Core/HW/Memmap.h" #include "Core/PowerPC/PowerPC.h" #include "DolphinWX/Frame.h" @@ -87,7 +88,7 @@ static wxString GetValueByRowCol(int row, int col) } else if (row <= (int)PowerPC::watches.GetWatches().size()) { - if (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) + if (Core::IsRunning()) { switch (col) { @@ -198,7 +199,7 @@ wxGridCellAttr* CWatchTable::GetAttr(int row, int col, wxGridCellAttr::wxAttrKin attr->SetTextColour(red ? *wxRED : *wxBLACK); - if (row > (int)(PowerPC::watches.GetWatches().size() + 1) || (PowerPC::GetState() == PowerPC::CPU_POWERDOWN)) + if (row > (int)(PowerPC::watches.GetWatches().size() + 1) || !Core::IsRunning()) { attr->SetReadOnly(true); attr->SetBackgroundColour(*wxLIGHT_GREY); @@ -224,7 +225,7 @@ CWatchView::CWatchView(wxWindow* parent, wxWindowID id) void CWatchView::Update() { - if (PowerPC::GetState() != PowerPC::CPU_POWERDOWN) + if (Core::IsRunning()) { m_watch_table->UpdateWatch(); ForceRefresh(); |