Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-04-30 06:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

expand env from wrapped cmd

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-11-18 11:18:50 +02:00
parent c12beb43a0
commit 09a118e85e
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/launch/LaunchTask.cpp
View File

@ -307,7 +307,7 @@ QString expandVariables(const QString& input, QProcessEnvironment dict)
return result;
}
QString LaunchTask::substituteVariables(QString& cmd) const
QString LaunchTask::substituteVariables(QString& cmd, bool isLaunch) const
{
return expandVariables(cmd, m_instance->createEnvironment());
return expandVariables(cmd, isLaunch ? m_instance->createLaunchEnvironment() : m_instance->createEnvironment());
}

2
launcher/launch/LaunchTask.h
View File

@ -87,7 +87,7 @@ class LaunchTask : public Task {
shared_qobject_ptr<LogModel> getLogModel();
public:
QString substituteVariables(QString& cmd) const;
QString substituteVariables(QString& cmd, bool isLaunch = false) const;
QString censorPrivateInfo(QString in);
protected: /* methods */

1
launcher/minecraft/launch/LauncherPartLaunch.cpp
View File

@ -131,6 +131,7 @@ void LauncherPartLaunch::executeTask()
QString wrapperCommandStr = instance->getWrapperCommand().trimmed();
if (!wrapperCommandStr.isEmpty()) {
wrapperCommandStr = m_parent->substituteVariables(wrapperCommandStr);
auto wrapperArgs = Commandline::splitArgs(wrapperCommandStr);
auto wrapperCommand = wrapperArgs.takeFirst();
auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand);