mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-08 08:39:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Change remux dialog to be non-modal

Browse Source 
Closes obsproject/obs-studio#1266
This commit is contained in:
Cephas Reis
2018-04-19 01:10:10 -05:00
committed by jp9000
parent 273482dbe9
commit ef41dc53e8
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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()