Browse Source

UI: Move OpenSavedProjecters call to OBSBasic::Load()

Due to the commit 34c14829b6176248970bb, source loading is now deferred
to after OBSInit(), which would cause saved scene/source projectors to
no longer load on startup.  This fixes that issue by moving the
OpenSavedProjectors call to OBSBasic::Load().
jp9000 7 năm trước cách đây
mục cha
commit
4fcc2cccfe
2 tập tin đã thay đổi với 4 bổ sung8 xóa
  1. 0 1
      UI/window-basic-main-scene-collections.cpp
  2. 4 7
      UI/window-basic-main.cpp

+ 0 - 1
UI/window-basic-main-scene-collections.cpp

@@ -237,7 +237,6 @@ void OBSBasic::RefreshSceneCollections()
 
 	OBSBasic *main = reinterpret_cast<OBSBasic*>(App()->GetMainWindow());
 
-	main->OpenSavedProjectors();
 	main->ui->actionPasteFilters->setEnabled(false);
 	main->ui->actionPasteRef->setEnabled(false);
 	main->ui->actionPasteDup->setEnabled(false);

+ 4 - 7
UI/window-basic-main.cpp

@@ -808,8 +808,11 @@ retryScene:
 		obs_data_array_t *savedProjectors = obs_data_get_array(data,
 				"saved_projectors");
 
-		if (savedProjectors)
+		if (savedProjectors) {
 			LoadSavedProjectors(savedProjectors);
+			OpenSavedProjectors();
+			activateWindow();
+		}
 
 		obs_data_array_release(savedProjectors);
 	}
@@ -5622,12 +5625,6 @@ void OBSBasic::OpenSceneWindow()
 
 void OBSBasic::OpenSavedProjectors()
 {
-	bool projectorSave = config_get_bool(GetGlobalConfig(),
-			"BasicWindow", "SaveProjectors");
-
-	if (!projectorSave)
-		return;
-
 	for (SavedProjectorInfo *info : savedProjectorsArray) {
 		OBSProjector *projector = nullptr;
 		switch (info->type) {