diff options
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 9189e82b11..ef1bbe7642 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -82,6 +82,7 @@ #include "DolphinQt/Config/LogWidget.h" #include "DolphinQt/Config/Mapping/MappingWindow.h" #include "DolphinQt/Config/SettingsWindow.h" +#include "DolphinQt/Debugger/AssemblerWidget.h" #include "DolphinQt/Debugger/BreakpointWidget.h" #include "DolphinQt/Debugger/CodeViewWidget.h" #include "DolphinQt/Debugger/CodeWidget.h" @@ -456,6 +457,7 @@ void MainWindow::CreateComponents() m_breakpoint_widget = new BreakpointWidget(this); m_code_widget = new CodeWidget(this); m_cheats_manager = new CheatsManager(this); + m_assembler_widget = new AssemblerWidget(this); const auto request_watch = [this](QString name, u32 addr) { m_watch_widget->AddWatch(name, addr); @@ -747,6 +749,7 @@ void MainWindow::ConnectStack() addDockWidget(Qt::LeftDockWidgetArea, m_memory_widget); addDockWidget(Qt::LeftDockWidgetArea, m_network_widget); addDockWidget(Qt::LeftDockWidgetArea, m_jit_widget); + addDockWidget(Qt::LeftDockWidgetArea, m_assembler_widget); tabifyDockWidget(m_log_widget, m_log_config_widget); tabifyDockWidget(m_log_widget, m_code_widget); @@ -757,6 +760,7 @@ void MainWindow::ConnectStack() tabifyDockWidget(m_log_widget, m_memory_widget); tabifyDockWidget(m_log_widget, m_network_widget); tabifyDockWidget(m_log_widget, m_jit_widget); + tabifyDockWidget(m_log_widget, m_assembler_widget); } void MainWindow::RefreshGameList() @@ -879,7 +883,16 @@ void MainWindow::OnStopComplete() SetFullScreenResolution(false); if (m_exit_requested || Settings::Instance().IsBatchModeEnabled()) - QGuiApplication::exit(0); + { + if (m_assembler_widget->ApplicationCloseRequest()) + { + QGuiApplication::exit(0); + } + else + { + m_exit_requested = false; + } + } // If the current emulation prevented the booting of another, do that now if (m_pending_boot != nullptr) |