From f8c589c7a2d593f44d8366d56c86dee98d253119 Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Sun, 2 May 2021 22:42:28 +0200
Subject: [PATCH] Only send scene switch msg if scene was switched

This change is to avoid spamming the connected clients with scene change
messages which might not even do anything as the scene change already
took place.
Additionally it allows scene switch messages to be sent by just calling
the switchScene() function.
---
 src/advanced-scene-switcher.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/advanced-scene-switcher.cpp b/src/advanced-scene-switcher.cpp
index 0641ed29..2003c9e5 100644
--- a/src/advanced-scene-switcher.cpp
+++ b/src/advanced-scene-switcher.cpp
@@ -554,9 +554,6 @@ void SwitcherData::Thread()
 		lock.unlock();
 
 		if (match) {
-			if (networkConfig.ServerEnabled) {
-				server.sendMessage(scene, transition);
-			}
 			switchScene(scene, transition,
 				    tansitionOverrideOverride,
 				    adjustActiveTransitionType, verbose);
@@ -653,6 +650,10 @@ void switchScene(OBSWeakSource &scene, OBSWeakSource &transition,
 		if (verbose) {
 			blog(LOG_INFO, "switched scene");
 		}
+
+		if (switcher->networkConfig.ServerEnabled) {
+			switcher->server.sendMessage(scene, transition);
+		}
 	}
 	obs_source_release(currentSource);
 	obs_source_release(source);