opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

UI: Disable hiding if settings open

Browse Source 
Fixes a bug where you could minimize to tray if the settings window was
open.
This commit is contained in:
jp9000
2016-09-21 21:20:06 -07:00
parent d4c4d7b674
commit 406a8c89ca
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/window-basic-main.cpp
+3 -3
View File
@@ -2701,9 +2701,11 @@ void OBSBasic::on_actionRemux_triggered()
void OBSBasic::on_action_Settings_triggered()
{
disableHiding = true;
OBSBasicSettings settings(this);
settings.exec();
SystemTray(false);
disableHiding = false;
}
void OBSBasic::on_actionAdvAudioProperties_triggered()
@@ -3950,9 +3952,7 @@ void OBSBasic::on_recordButton_clicked()
void OBSBasic::on_settingsButton_clicked()
{
OBSBasicSettings settings(this);
settings.exec();
SystemTray(false);
on_action_Settings_triggered();
}
void OBSBasic::on_actionWebsite_triggered()