From 6c4e4b8cd8e029c8ffb5d895ea0eeb192be122f8 Mon Sep 17 00:00:00 2001
From: Przemek Pawlas <3606072+Destroy666x@users.noreply.github.com>
Date: Thu, 7 Mar 2024 03:17:16 +0100
Subject: [PATCH] Don't show 2 warning popups for groups with macros

---
 data/locale/en-US.ini   | 2 +-
 lib/macro/macro-tab.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
index a32d54da..39cd7e37 100644
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
@@ -112,7 +112,7 @@ AdvSceneSwitcher.macroTab.defaultname="Macro %1"
 AdvSceneSwitcher.macroTab.defaultGroupName="Group %1"
 AdvSceneSwitcher.macroTab.exists="Macro name exists already"
 AdvSceneSwitcher.macroTab.removeSingleMacroPopup.text="Are you sure you want to remove \"%1\"?"
-AdvSceneSwitcher.macroTab.removeMultipleMacrosPopup.text="Are you sure you want to remove %1 macros?"
+AdvSceneSwitcher.macroTab.removeMultipleMacrosPopup.text="Are you sure you want to remove %1 macros/groups?"
 AdvSceneSwitcher.macroTab.removeGroupPopup.text="Are you sure you want to remove \"%1\" group and all its elements?"
 AdvSceneSwitcher.macroTab.contextMenuAdd="Add"
 AdvSceneSwitcher.macroTab.copy="Duplicate Macro"
diff --git a/lib/macro/macro-tab.cpp b/lib/macro/macro-tab.cpp
index a18e11fc..d7e18e55 100644
--- a/lib/macro/macro-tab.cpp
+++ b/lib/macro/macro-tab.cpp
@@ -116,10 +116,11 @@ void AdvSceneSwitcher::RemoveSelectedMacros()
 		QString deleteWarning = obs_module_text(
 			"AdvSceneSwitcher.macroTab.removeSingleMacroPopup.text");
 		auto macro = macros.at(0);
+		deleteWarning = deleteWarning.arg(
+			QString::fromStdString(macro->Name()));
 
-		if (!DisplayMessage(deleteWarning.arg(QString::fromStdString(
-					    macro->Name())),
-				    true)) {
+		if ((!macro->IsGroup() || macro->GroupSize() == 0) &&
+		    !DisplayMessage(deleteWarning, true)) {
 			return;
 		}