mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-01-27 23:59:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #758 from cg2121/command-line-args

Browse Source 
UI: Add more command line options
This commit is contained in:
Jim
2017-01-29 19:42:37 -08:00
committed by GitHub
parent 73a1bf9236 7c98edccc5
commit ce46ffa82e
3 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -789,6 +789,12 @@ retryScene:
opt_start_recording = false;
}
if (opt_start_replaybuffer) {
QMetaObject::invokeMethod(this, "StartReplayBuffer",
Qt::QueuedConnection);
opt_start_replaybuffer = false;
}
LogScenes();
disableSaving--;
@@ -1248,8 +1254,14 @@ void OBSBasic::OBSInit()
"BasicWindow", "SwapScenesMode");
editPropertiesMode = config_get_bool(App()->GlobalConfig(),
"BasicWindow", "EditPropertiesMode");
SetPreviewProgramMode(config_get_bool(App()->GlobalConfig(),
"BasicWindow", "PreviewProgramMode"));
if (!opt_studio_mode) {
SetPreviewProgramMode(config_get_bool(App()->GlobalConfig(),
"BasicWindow", "PreviewProgramMode"));
} else {
SetPreviewProgramMode(true);
opt_studio_mode = false;
}
#define SET_VISIBILITY(name, control) \
do { \
@@ -5215,12 +5227,14 @@ void OBSBasic::SystemTray(bool firstStarted)
if (!sysTrayWhenStarted && !sysTrayEnabled) {
trayIcon->hide();
} else if (sysTrayWhenStarted && sysTrayEnabled) {
} else if ((sysTrayWhenStarted && sysTrayEnabled)
|| opt_minimize_tray) {
trayIcon->show();
if (firstStarted) {
QTimer::singleShot(50, this, SLOT(hide()));
EnablePreviewDisplay(false);
setVisible(false);
opt_minimize_tray = false;
}
} else if (sysTrayEnabled) {
trayIcon->show();