提交 406a8c89 编写于 作者: J jp9000

UI: Disable hiding if settings open

Fixes a bug where you could minimize to tray if the settings window was
open.
上级 d4c4d7b6
......@@ -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()
......
......@@ -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:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册