OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-04 10:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Move restart to end of main()

Browse source
This commit is contained in:
derrod 2023-08-18 15:46:21 +02:00 committed by Lain
parent 6640d973b3
commit 4e5be319e4
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
UI/obs-app.cpp
View file

@ -110,6 +110,7 @@ string opt_starting_scene;
bool restart = false;
bool restart_safe = false;
QStringList arguments;
QPointer<OBSLogViewer> obsLogViewer;
@ -2587,16 +2588,13 @@ static int run_program(fstream &logFile, int argc, char *argv[])
}
if (restart || restart_safe) {
auto args = qApp->arguments();
auto executable = args[0];
arguments = qApp->arguments();
if (restart_safe) {
args.append("--safe-mode");
arguments.append("--safe-mode");
} else {
args.removeAll("--safe-mode");
arguments.removeAll("--safe-mode");
}
QProcess::startDetached(executable, args);
}
return ret;
@ -3511,5 +3509,11 @@ int main(int argc, char *argv[])
delete_safe_mode_sentinel();
blog(LOG_INFO, "Number of memory leaks: %ld", bnum_allocs());
base_set_log_handler(nullptr, nullptr);
if (restart || restart_safe) {
auto executable = arguments.takeFirst();
QProcess::startDetached(executable, arguments);
}
return ret;
}