From 5fc21edc1f42a9d90a3499e8e6bd0cc87cf1d1ad Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 2 Jul 2015 16:17:55 -0700 Subject: [PATCH] UI: Clear scene data before loading new scene data Clear scene data before loading new scene files or when creating new scene data from scratch. --- obs/window-basic-main.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp index b79cc5edb..66f971707 100644 --- a/obs/window-basic-main.cpp +++ b/obs/window-basic-main.cpp @@ -348,6 +348,8 @@ void OBSBasic::CreateDefaultScene() bool hasDesktopAudio = HasAudioDevices(App()->OutputAudioSource()); bool hasInputAudio = HasAudioDevices(App()->InputAudioSource()); + ClearSceneData(); + obs_scene_t *scene = obs_scene_create(Str("Basic.Scene")); obs_source_t *source = obs_scene_get_source(scene); @@ -418,6 +420,8 @@ void OBSBasic::Load(const char *file) return; } + ClearSceneData(); + obs_data_t *data = obs_data_create_from_json(jsonData); obs_data_array_t *sceneOrder = obs_data_get_array(data, "scene_order"); obs_data_array_t *sources = obs_data_get_array(data, "sources");