jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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().
This commit is contained in:
jp9000 2018-04-18 19:15:52 -07:00
parent 7481f5b389
commit 4fcc2cccfe
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UI/window-basic-main-scene-collections.cpp
View File

@ -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);

11
UI/window-basic-main.cpp
View File

@ -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) {