浏览代码

UI: Break out the opening of a projector into a slot function

Chris Angelico 6 年之前
父节点
当前提交
412a75601e
共有 2 个文件被更改,包括 9 次插入1 次删除
  1. 8 1
      UI/window-basic-main.cpp
  2. 1 0
      UI/window-basic-main.hpp

+ 8 - 1
UI/window-basic-main.cpp

@@ -6570,6 +6570,13 @@ void OBSBasic::OpenSceneWindow()
 void OBSBasic::OpenSavedProjectors()
 {
 	for (SavedProjectorInfo *info : savedProjectorsArray) {
+		OpenSavedProjector(info);
+	}
+}
+
+void OBSBasic::OpenSavedProjector(SavedProjectorInfo *info)
+{
+	if (info) {
 		OBSProjector *projector = nullptr;
 		switch (info->type) {
 		case ProjectorType::Source:
@@ -6577,7 +6584,7 @@ void OBSBasic::OpenSavedProjectors()
 			OBSSource source =
 				obs_get_source_by_name(info->name.c_str());
 			if (!source)
-				continue;
+				return;
 
 			projector = OpenProjector(source, info->monitor,
 						  info->type);

+ 1 - 0
UI/window-basic-main.hpp

@@ -621,6 +621,7 @@ private slots:
 	void ScenePasteFilters();
 
 	void CheckDiskSpaceRemaining();
+	void OpenSavedProjector(SavedProjectorInfo *info);
 
 	void ScenesReordered(const QModelIndex &parent, int start, int end,
 			     const QModelIndex &destination, int row);