summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2022-03-19 16:52:20 +0100
committerGitHub <noreply@github.com>2022-03-19 16:52:20 +0100
commitf5657d0a83adf8a7591a3ee12aa509fd6844f1bc (patch)
treedd14a6f4f1547ec056f210fa8c4ca907e5b362ff /Source/Core
parent0ed6bfc7134f369f90c075763786080af2d3b4b5 (diff)
parent61a5d3bf745258e06cc053ae06e66da0b4cfc120 (diff)
Merge pull request #10174 from dreamsyntax/panic-handles-restore-messages
DolphinQt: Add "Reset Ignore Panic Handler" MenuBar Option
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinQt/MenuBar.cpp8
-rw-r--r--Source/Core/DolphinQt/MenuBar.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp
index 4797da750c..2ff85d535f 100644
--- a/Source/Core/DolphinQt/MenuBar.cpp
+++ b/Source/Core/DolphinQt/MenuBar.cpp
@@ -165,6 +165,7 @@ void MenuBar::OnDebugModeToggled(bool enabled)
// Options
m_boot_to_pause->setVisible(enabled);
m_automatic_start->setVisible(enabled);
+ m_reset_ignore_panic_handler->setVisible(enabled);
m_change_font->setVisible(enabled);
// View
@@ -543,6 +544,13 @@ void MenuBar::AddOptionsMenu()
connect(m_automatic_start, &QAction::toggled, this,
[](bool enable) { SConfig::GetInstance().bAutomaticStart = enable; });
+ m_reset_ignore_panic_handler = options_menu->addAction(tr("Reset Ignore Panic Handler"));
+
+ connect(m_reset_ignore_panic_handler, &QAction::triggered, this, []() {
+ if (Config::Get(Config::MAIN_USE_PANIC_HANDLERS))
+ Common::SetEnableAlert(true);
+ });
+
m_change_font = options_menu->addAction(tr("&Font..."), this, &MenuBar::ChangeDebugFont);
}
diff --git a/Source/Core/DolphinQt/MenuBar.h b/Source/Core/DolphinQt/MenuBar.h
index d745f52e9b..0841bdff07 100644
--- a/Source/Core/DolphinQt/MenuBar.h
+++ b/Source/Core/DolphinQt/MenuBar.h
@@ -234,6 +234,7 @@ private:
// Options
QAction* m_boot_to_pause;
QAction* m_automatic_start;
+ QAction* m_reset_ignore_panic_handler;
QAction* m_change_font;
QAction* m_controllers_action;