OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00: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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
UI/window-basic-main.cpp
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()

6
UI/window-basic-main.hpp
View file

@ -150,6 +150,7 @@ private:
QAction *showHide;
QAction *showPreview;
QAction *exit;
bool disableHiding = false;
void DrawBackdrop(float cx, float cy);
@ -362,7 +363,10 @@ private slots:
inline void ToggleShowHide()
{
SetShowing(!isVisible());
bool showing = isVisible();
if (disableHiding && showing)
return;
SetShowing(!showing);
}
private: