mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

UI: Don't defer load on non-macOS systems

Browse Source 
Deferred load is used specifically for macOS systems to ensure that Qt
and CEF do not load at the same time.  This causes a slight bit of a
delay in loading the scene after the UI has loaded.  This is not
necessary for other operating systems, so revert to the older load code
in the case of different systems.
This commit is contained in:
jp9000 2018-05-01 12:01:11 -07:00
parent e9d22bdbd6
commit 72636ca976
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1450,6 +1450,15 @@ void OBSBasic::OBSInit()
SET_VISIBILITY("ShowStatusBar", toggleStatusBar);
#undef SET_VISIBILITY
#ifndef __APPLE__
{
ProfileScope("OBSBasic::Load");
disableSaving--;
Load(savePath);
disableSaving++;
}
#endif
TimedCheckForUpdates();
loaded = true;
@ -1470,6 +1479,9 @@ void OBSBasic::OBSInit()
}
#endif
#ifndef __APPLE__
RefreshSceneCollections();
#endif
RefreshProfiles();
disableSaving--;
@ -1585,6 +1597,7 @@ void OBSBasic::OBSInit()
ui->actionCheckForUpdates = nullptr;
#endif
#ifdef __APPLE__
/* This is an incredibly unpleasant hack for macOS to isolate CEF
* initialization until after all tasks related to Qt startup and main
* window initialization have completed. There is a macOS-specific bug
@ -1604,6 +1617,7 @@ void OBSBasic::OBSInit()
Qt::QueuedConnection,
Q_ARG(QString, QT_UTF8(savePath)),
Q_ARG(int, 10));
#endif
}
void OBSBasic::DeferredLoad(const QString &file, int requeueCount)