From 4215332eb40820a476f90c084f388ce6432e431a Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sun, 24 Sep 2023 21:04:59 -0700
Subject: [PATCH] Revert "Qt: Ensure action set is clean before (re)building"

This reverts commit 3ee12b1a55b6b86e7c95a596c3457f2e3b1930d8.
---
 src/platform/qt/ConfigController.cpp | 4 ----
 src/platform/qt/ConfigController.h   | 1 -
 src/platform/qt/Window.cpp           | 5 -----
 3 files changed, 10 deletions(-)

diff --git a/src/platform/qt/ConfigController.cpp b/src/platform/qt/ConfigController.cpp
index 907753f1c..7a26ea844 100644
--- a/src/platform/qt/ConfigController.cpp
+++ b/src/platform/qt/ConfigController.cpp
@@ -220,10 +220,6 @@ void ConfigController::updateOption(const char* key) {
 	m_optionSet[optionName]->setValue(mCoreConfigGetValue(&m_config, key));
 }
 
-void ConfigController::clearOptions() {
-	m_optionSet.clear();
-}
-
 QString ConfigController::getOption(const char* key, const QVariant& defaultVal) const {
 	const char* val = mCoreConfigGetValue(&m_config, key);
 	if (val) {
diff --git a/src/platform/qt/ConfigController.h b/src/platform/qt/ConfigController.h
index e59dcf98b..4c71c3943 100644
--- a/src/platform/qt/ConfigController.h
+++ b/src/platform/qt/ConfigController.h
@@ -80,7 +80,6 @@ public:
 
 	ConfigOption* addOption(const char* key);
 	void updateOption(const char* key);
-	void clearOptions();
 
 	QString getOption(const char* key, const QVariant& defaultVal = QVariant()) const;
 	QString getOption(const QString& key, const QVariant& defaultVal = QVariant()) const;
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 6c9d77d2a..414114b4b 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -1261,11 +1261,6 @@ void Window::setupMenu(QMenuBar* menubar) {
 	installEventFilter(m_shortcutController);
 
 	menubar->clear();
-	m_gameActions.clear();
-	m_nonMpActions.clear();
-	m_platformActions.clear();
-	m_config->clearOptions();
-
 	m_actions.addMenu(tr("&File"), "file");
 
 	m_actions.addAction(tr("Load &ROM..."), "loadROM", this, &Window::selectROM, "file", QKeySequence::Open);