提交 ef41dc53 编写于 作者: C Cephas Reis 提交者: jp9000

UI: Change remux dialog to be non-modal

Closes obsproject/obs-studio#1266
上级 273482db
......@@ -3245,6 +3245,7 @@ void OBSBasic::CloseDialogs()
}
if (!stats.isNull()) stats->close(); //call close to save Stats geometry
if (!remux.isNull()) remux->close();
}
void OBSBasic::EnumDialogs()
......@@ -3384,12 +3385,21 @@ void OBSBasic::on_actionShow_Recordings_triggered()
void OBSBasic::on_actionRemux_triggered()
{
if (!remux.isNull()) {
remux->show();
remux->raise();
return;
}
const char *mode = config_get_string(basicConfig, "Output", "Mode");
const char *path = strcmp(mode, "Advanced") ?
config_get_string(basicConfig, "SimpleOutput", "FilePath") :
config_get_string(basicConfig, "AdvOut", "RecFilePath");
OBSRemux remux(path, this);
remux.exec();
OBSRemux *remuxDlg;
remuxDlg = new OBSRemux(path, this);
remuxDlg->show();
remux = remuxDlg;
}
void OBSBasic::on_action_Settings_triggered()
......
......@@ -170,6 +170,7 @@ private:
QList<QPointer<QWidget>> windowProjectors;
QPointer<QWidget> stats;
QPointer<QWidget> remux;
QPointer<QMenu> startStreamMenu;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册