mirror/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp synced 2026-08-31 18:02:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve error message behavior on installer for invalid sources. (#77)

Browse Source
This commit is contained in:
Darío
2025-01-16 12:13:14 -03:00
committed by GitHub
parent 5f9fdcf934
commit 5c98a34084
8 changed files with 51 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UnleashedRecomp/ui/installer_wizard.cpp
+15 -5
View File
@@ -1123,7 +1123,7 @@ static void InstallerStart()
g_installerThread = std::make_unique<std::thread>(InstallerThread);
}
static bool InstallerParseSources()
static bool InstallerParseSources(std::string &errorMessage)
{
std::error_code spaceErrorCode;
std::filesystem::space_info spaceInfo = std::filesystem::space(g_installPath, spaceErrorCode);
@@ -1136,14 +1136,17 @@ static bool InstallerParseSources()
installerInput.gameSource = g_gameSourcePath;
installerInput.updateSource = g_updateSourcePath;
for (std::filesystem::path &path : g_dlcSourcePaths) {
for (std::filesystem::path &path : g_dlcSourcePaths)
{
if (!path.empty())
{
installerInput.dlcSources.push_back(path);
}
}
return Installer::parseSources(installerInput, g_installerJournal, g_installerSources);
bool sourcesParsed = Installer::parseSources(installerInput, g_installerJournal, g_installerSources);
errorMessage = g_installerJournal.lastErrorMessage;
return sourcesParsed;
}
static void DrawNextButton()
@@ -1195,10 +1198,17 @@ static void DrawNextButton()
}
bool dlcInstallerMode = g_gameSourcePath.empty();
if (!InstallerParseSources())
std::string sourcesErrorMessage;
if (!InstallerParseSources(sourcesErrorMessage))
{
// Some of the sources that were provided to the installer are not valid. Restart the file selection process.
g_currentMessagePrompt = Localise("Installer_Message_InvalidFiles");
std::stringstream stringStream;
stringStream << Localise("Installer_Message_InvalidFiles");
if (!sourcesErrorMessage.empty()) {
stringStream << std::endl << std::endl << sourcesErrorMessage;
}
g_currentMessagePrompt = stringStream.str();
g_currentMessagePromptConfirmation = false;
g_currentPage = dlcInstallerMode ? WizardPage::SelectDLC : WizardPage::SelectGameAndUpdate;
}