浏览代码

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.
jp9000 10 年之前
父节点
当前提交
5fc21edc1f
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      obs/window-basic-main.cpp

+ 4 - 0
obs/window-basic-main.cpp

@@ -348,6 +348,8 @@ void OBSBasic::CreateDefaultScene()
 	bool hasDesktopAudio = HasAudioDevices(App()->OutputAudioSource());
 	bool hasDesktopAudio = HasAudioDevices(App()->OutputAudioSource());
 	bool hasInputAudio   = HasAudioDevices(App()->InputAudioSource());
 	bool hasInputAudio   = HasAudioDevices(App()->InputAudioSource());
 
 
+	ClearSceneData();
+
 	obs_scene_t  *scene  = obs_scene_create(Str("Basic.Scene"));
 	obs_scene_t  *scene  = obs_scene_create(Str("Basic.Scene"));
 	obs_source_t *source = obs_scene_get_source(scene);
 	obs_source_t *source = obs_scene_get_source(scene);
 
 
@@ -418,6 +420,8 @@ void OBSBasic::Load(const char *file)
 		return;
 		return;
 	}
 	}
 
 
+	ClearSceneData();
+
 	obs_data_t       *data       = obs_data_create_from_json(jsonData);
 	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 *sceneOrder = obs_data_get_array(data, "scene_order");
 	obs_data_array_t *sources    = obs_data_get_array(data, "sources");
 	obs_data_array_t *sources    = obs_data_get_array(data, "sources");