ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2845 from Trial97/typo

Browse Source 
fix updater typo
This commit is contained in:
Alexandru Ionut Tripon 2024-09-22 19:09:40 +03:00 committed by GitHub
commit 4a40b53e5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/java/download/ArchiveDownloadTask.cpp
View File

@ -95,7 +95,7 @@ void ArchiveDownloadTask::extractJava(QString input)
} }
auto files = zip->getFileNameList(); auto files = zip->getFileNameList();
if (files.isEmpty()) { if (files.isEmpty()) {
emitFailed(tr("No files were found in the supplied zip file,")); emitFailed(tr("No files were found in the supplied zip file."));
return; return;
} }
m_task = makeShared<MMCZip::ExtractZipTask>(zip, m_final_path, files[0]); m_task = makeShared<MMCZip::ExtractZipTask>(zip, m_final_path, files[0]);

4
launcher/updater/prismupdater/PrismUpdater.cpp
View File

@ -1210,7 +1210,7 @@ std::optional<QDir> PrismUpdaterApp::unpackArchive(QFileInfo archive)
QProcess proc = QProcess(); QProcess proc = QProcess();
proc.start(cmd, args); proc.start(cmd, args);
if (!proc.waitForStarted(5000)) { // wait 5 seconds to start if (!proc.waitForStarted(5000)) { // wait 5 seconds to start
auto msg = tr("Failed to launcher child process \"%1 %2\".").arg(cmd).arg(args.join(" ")); auto msg = tr("Failed to launch child process \"%1 %2\".").arg(cmd).arg(args.join(" "));
logUpdate(msg); logUpdate(msg);
showFatalErrorMessage(tr("Failed extract archive"), msg); showFatalErrorMessage(tr("Failed extract archive"), msg);
return std::nullopt; return std::nullopt;
@ -1241,7 +1241,7 @@ bool PrismUpdaterApp::loadPrismVersionFromExe(const QString& exe_path)
proc.setReadChannel(QProcess::StandardOutput); proc.setReadChannel(QProcess::StandardOutput);
proc.start(exe_path, { "--version" }); proc.start(exe_path, { "--version" });
if (!proc.waitForStarted(5000)) { if (!proc.waitForStarted(5000)) {
showFatalErrorMessage(tr("Failed to Check Version"), tr("Failed to launcher child launcher process to read version.")); showFatalErrorMessage(tr("Failed to Check Version"), tr("Failed to launch child process to read version."));
return false; return false;
} // wait 5 seconds to start } // wait 5 seconds to start
if (!proc.waitForFinished(5000)) { if (!proc.waitForFinished(5000)) {