From 5b25dec714e46249089472aace992e13ef5126f6 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Fri, 4 Jun 2021 18:56:28 -0700
Subject: [PATCH] Revert "UI: Fix spamming of log when setting current scene"

This reverts commit 9ca7e1cb0f1a8c16eb7e565da763ea2591169991.

Fixes obsproject/obs-studio#4801
---
 UI/window-basic-main-transitions.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/UI/window-basic-main-transitions.cpp b/UI/window-basic-main-transitions.cpp
index e3c95567d..d662f82b7 100644
--- a/UI/window-basic-main-transitions.cpp
+++ b/UI/window-basic-main-transitions.cpp
@@ -729,10 +729,11 @@ void OBSBasic::SetCurrentScene(OBSSource scene, bool force)
 				obs_source_inc_showing(scene);
 			if (actualLastScene)
 				obs_source_dec_showing(actualLastScene);
+			lastScene = OBSGetWeakRef(scene);
 		}
 	}
 
-	if (OBSGetStrongRef(lastScene) != scene) {
+	if (obs_scene_get_source(GetCurrentScene()) != scene) {
 		for (int i = 0; i < ui->scenes->count(); i++) {
 			QListWidgetItem *item = ui->scenes->item(i);
 			OBSScene itemScene = GetOBSRef<OBSScene>(item);
@@ -748,16 +749,16 @@ void OBSBasic::SetCurrentScene(OBSSource scene, bool force)
 				break;
 			}
 		}
+	}
 
-		lastScene = OBSGetWeakRef(scene);
+	UpdateContextBar(true);
 
+	if (scene) {
 		bool userSwitched = (!force && !disableSaving);
 		blog(LOG_INFO, "%s to scene '%s'",
 		     userSwitched ? "User switched" : "Switched",
 		     obs_source_get_name(scene));
 	}
-
-	UpdateContextBar(true);
 }
 
 void OBSBasic::CreateProgramDisplay()
@@ -1685,6 +1686,7 @@ void OBSBasic::SetPreviewProgramMode(bool enabled)
 			OBSSource actualLastScene = OBSGetStrongRef(lastScene);
 			if (actualLastScene)
 				obs_source_dec_showing(actualLastScene);
+			lastScene = nullptr;
 		}
 
 		programScene = nullptr;