From fcf57ee0316c12899e63e6a6b17b6aeb1deb6b99 Mon Sep 17 00:00:00 2001
From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com>
Date: Wed, 21 May 2025 10:35:26 +0200
Subject: [PATCH] Add support for widget caching to SceneSelectionWidget

---
 lib/utils/scene-selection.cpp | 13 +++++++++----
 lib/utils/scene-selection.hpp |  4 ++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/lib/utils/scene-selection.cpp b/lib/utils/scene-selection.cpp
index 16b7b051..3c2a444e 100644
--- a/lib/utils/scene-selection.cpp
+++ b/lib/utils/scene-selection.cpp
@@ -409,6 +409,13 @@ void SceneSelectionWidget::SetScene(const SceneSelection &s)
 	_currentSelection = s;
 }
 
+void SceneSelectionWidget::showEvent(QShowEvent *event)
+{
+	FilterComboBox::showEvent(event);
+	const QSignalBlocker b(this);
+	Reset();
+}
+
 bool SceneSelectionWidget::IsCurrentSceneSelected(const QString &name)
 {
 	return name == QString::fromStdString((obs_module_text(
@@ -435,9 +442,8 @@ void SceneSelectionWidget::SelectionChanged(int)
 
 void SceneSelectionWidget::ItemAdd(const QString &)
 {
-	blockSignals(true);
+	const QSignalBlocker b(this);
 	Reset();
-	blockSignals(false);
 }
 
 bool SceneSelectionWidget::NameUsed(const QString &name)
@@ -462,9 +468,8 @@ void SceneSelectionWidget::ItemRemove(const QString &name)
 
 void SceneSelectionWidget::ItemRename(const QString &, const QString &)
 {
-	blockSignals(true);
+	const QSignalBlocker b(this);
 	Reset();
-	blockSignals(false);
 }
 
 } // namespace advss
diff --git a/lib/utils/scene-selection.hpp b/lib/utils/scene-selection.hpp
index fe581265..e40ce6eb 100644
--- a/lib/utils/scene-selection.hpp
+++ b/lib/utils/scene-selection.hpp
@@ -45,6 +45,10 @@ public:
 				    bool previous = false, bool current = false,
 				    bool preview = false);
 	EXPORT void SetScene(const SceneSelection &);
+
+protected:
+	void showEvent(QShowEvent *event) override;
+
 signals:
 	void SceneChanged(const SceneSelection &);