From e39fa5e902483f9db3b4c2b4b9f8bfcf19b4624f Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 9 Apr 2021 04:19:01 -0700 Subject: [PATCH] UI: Clear undo stack in ClearSceneData() instead Makes more sense to clear it here. --- UI/window-basic-main-scene-collections.cpp | 2 -- UI/window-basic-main.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/UI/window-basic-main-scene-collections.cpp b/UI/window-basic-main-scene-collections.cpp index a45bd2661..fb0cdf522 100644 --- a/UI/window-basic-main-scene-collections.cpp +++ b/UI/window-basic-main-scene-collections.cpp @@ -554,8 +554,6 @@ void OBSBasic::ChangeSceneCollection() UpdateTitleBar(); - undo_s.clear(); - if (api) api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CHANGED); } diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 4339b8733..c490ed08d 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -4386,6 +4386,8 @@ void OBSBasic::ClearSceneData() if (api) api->on_event(OBS_FRONTEND_EVENT_SCENE_COLLECTION_CLEANUP); + undo_s.clear(); + disableSaving--; blog(LOG_INFO, "All scene data cleared");