1berry/obs-studio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

frontend-tools: Display dialog when changing Python version

Browse Source 
Runtime switching of Python version is not supported.
This commit is contained in:
Matt Gajownik 2022-08-06 15:32:31 +10:00 committed by Matt Gajownik
parent 1b2fc73021
commit 493270e022
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/frontend-plugins/frontend-tools/data/locale/en-US.ini
View File

@ -41,6 +41,8 @@ PythonSettings.PythonInstallPath64bit="Python Install Path (64bit)"
PythonSettings.BrowsePythonPath="Browse Python Path" PythonSettings.BrowsePythonPath="Browse Python Path"
PythonSettings.PythonVersion="Loaded Python Version: %1" PythonSettings.PythonVersion="Loaded Python Version: %1"
PythonSettings.PythonNotLoaded="Python not currently loaded" PythonSettings.PythonNotLoaded="Python not currently loaded"
PythonSettings.AlreadyLoaded.Title="Python Already Loaded"
PythonSettings.AlreadyLoaded.Message="A copy of Python %1 is already loaded. To load the newly selected Python version, please restart OBS."
ScriptLogWindow="Script Log" ScriptLogWindow="Script Log"
Description="Description" Description="Description"
ScriptDescriptionLink.Text="Open this link in your default web browser?" ScriptDescriptionLink.Text="Open this link in your default web browser?"

18
UI/frontend-plugins/frontend-tools/scripts.cpp
View File

@ -470,8 +470,24 @@ void ScriptsTool::on_pythonPathBrowse_clicked()
ui->pythonPath->setText(newPath); ui->pythonPath->setText(newPath);
if (obs_scripting_python_loaded()) bool loaded = obs_scripting_python_loaded();
if (loaded && !newPath.isEmpty() && curPath.compare(newPath) != 0) {
char version[8];
obs_scripting_python_version(version, sizeof(version));
QString message =
QString(obs_module_text(
"PythonSettings.AlreadyLoaded.Message"))
.arg(version);
OBSMessageBox::information(
this,
obs_module_text("PythonSettings.AlreadyLoaded.Title"),
message);
return; return;
} else if (loaded) {
return;
}
if (!obs_scripting_load_python(path)) if (!obs_scripting_load_python(path))
return; return;