diff options
| author | 2015-01-07 12:14:23 +0100 | |
|---|---|---|
| committer | 2015-01-11 21:22:51 +0100 | |
| commit | 2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f (patch) | |
| tree | 110079649f6649195c93b53815aceaab14b183fc /src/citra_qt/main.cpp | |
| parent | Merge pull request #402 from chrisvj/master (diff) | |
| download | yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.tar.gz yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.tar.xz yuzu-2bbc12e6c3dbeb2b8cc73753c1fddca94bdde50f.zip | |
citra-qt: Replace OnCpuStepped signal by new signals DebugModeEntered and DebugModeLeft
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index c6671bef1..ece593e5d 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -124,9 +124,13 @@ GMainWindow::GMainWindow() | |||
| 124 | connect(ui.action_Hotkeys, SIGNAL(triggered()), this, SLOT(OnOpenHotkeysDialog())); | 124 | connect(ui.action_Hotkeys, SIGNAL(triggered()), this, SLOT(OnOpenHotkeysDialog())); |
| 125 | 125 | ||
| 126 | // BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views before the CPU continues | 126 | // BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views before the CPU continues |
| 127 | connect(&render_window->GetEmuThread(), SIGNAL(CPUStepped()), disasmWidget, SLOT(OnCPUStepped()), Qt::BlockingQueuedConnection); | 127 | connect(&render_window->GetEmuThread(), SIGNAL(DebugModeEntered()), disasmWidget, SLOT(OnDebugModeEntered()), Qt::BlockingQueuedConnection); |
| 128 | connect(&render_window->GetEmuThread(), SIGNAL(CPUStepped()), registersWidget, SLOT(OnCPUStepped()), Qt::BlockingQueuedConnection); | 128 | connect(&render_window->GetEmuThread(), SIGNAL(DebugModeEntered()), registersWidget, SLOT(OnDebugModeEntered()), Qt::BlockingQueuedConnection); |
| 129 | connect(&render_window->GetEmuThread(), SIGNAL(CPUStepped()), callstackWidget, SLOT(OnCPUStepped()), Qt::BlockingQueuedConnection); | 129 | connect(&render_window->GetEmuThread(), SIGNAL(DebugModeEntered()), callstackWidget, SLOT(OnDebugModeEntered()), Qt::BlockingQueuedConnection); |
| 130 | |||
| 131 | connect(&render_window->GetEmuThread(), SIGNAL(DebugModeLeft()), disasmWidget, SLOT(OnDebugModeLeft()), Qt::BlockingQueuedConnection); | ||
| 132 | connect(&render_window->GetEmuThread(), SIGNAL(DebugModeLeft()), registersWidget, SLOT(OnDebugModeLeft()), Qt::BlockingQueuedConnection); | ||
| 133 | connect(&render_window->GetEmuThread(), SIGNAL(DebugModeLeft()), callstackWidget, SLOT(OnDebugModeLeft()), Qt::BlockingQueuedConnection); | ||
| 130 | 134 | ||
| 131 | // Setup hotkeys | 135 | // Setup hotkeys |
| 132 | RegisterHotkey("Main Window", "Load File", QKeySequence::Open); | 136 | RegisterHotkey("Main Window", "Load File", QKeySequence::Open); |
| @@ -167,8 +171,8 @@ void GMainWindow::BootGame(std::string filename) | |||
| 167 | } | 171 | } |
| 168 | 172 | ||
| 169 | disasmWidget->Init(); | 173 | disasmWidget->Init(); |
| 170 | registersWidget->OnCPUStepped(); | 174 | registersWidget->OnDebugModeEntered(); |
| 171 | callstackWidget->OnCPUStepped(); | 175 | callstackWidget->OnDebugModeEntered(); |
| 172 | 176 | ||
| 173 | render_window->GetEmuThread().SetFilename(filename); | 177 | render_window->GetEmuThread().SetFilename(filename); |
| 174 | render_window->GetEmuThread().start(); | 178 | render_window->GetEmuThread().start(); |