Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed a variable name in FileData that was too similarly named to another variable.

Browse source
This commit is contained in:
Leon Styhre 2021-06-23 20:37:18 +02:00
parent ee17c34435
commit 22cbc71ef8
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
es-app/src/FileData.cpp
View file

@ -809,11 +809,11 @@ void FileData::launchGame(Window* window)
command = Utils::FileSystem::expandHomePath(command); command = Utils::FileSystem::expandHomePath(command);
// Check that the emulator binary actually exists, and if so, get its path. // Check that the emulator binary actually exists, and if so, get its path.
std::string emuPath = findEmulatorPath(command); std::string binaryPath = findEmulatorPath(command);
// Hack to show an error message if there was no emulator entry in es_find_rules.xml. // Hack to show an error message if there was no emulator entry in es_find_rules.xml.
if (emuPath.substr(0, 18) == "NO EMULATOR RULE: ") { if (binaryPath.substr(0, 18) == "NO EMULATOR RULE: ") {
std::string emulatorEntry = emuPath.substr(18, emuPath.size() - 18); std::string emulatorEntry = binaryPath.substr(18, binaryPath.size() - 18);
LOG(LogError) << "Couldn't launch game, either there is no emulator entry for \"" << LOG(LogError) << "Couldn't launch game, either there is no emulator entry for \"" <<
emulatorEntry << "\" in es_find_rules.xml or there are no systempath or staticpath " emulatorEntry << "\" in es_find_rules.xml or there are no systempath or staticpath "
"rules defined"; "rules defined";
@ -825,7 +825,7 @@ void FileData::launchGame(Window* window)
window->setInfoPopup(s); window->setInfoPopup(s);
return; return;
} }
else if (emuPath.empty()) { else if (binaryPath.empty()) {
LOG(LogError) << "Couldn't launch game, emulator binary not found"; LOG(LogError) << "Couldn't launch game, emulator binary not found";
LOG(LogError) << "Raw emulator launch command:"; LOG(LogError) << "Raw emulator launch command:";
LOG(LogError) << commandRaw; LOG(LogError) << commandRaw;
@ -852,7 +852,7 @@ void FileData::launchGame(Window* window)
std::string coreFile; std::string coreFile;
if (spacePos != std::string::npos) { if (spacePos != std::string::npos) {
coreRaw = command.substr(emuPathPos, spacePos - emuPathPos); coreRaw = command.substr(emuPathPos, spacePos - emuPathPos);
coreFile = Utils::FileSystem::getParent(emuPath) + coreFile = Utils::FileSystem::getParent(binaryPath) +
command.substr(emuPathPos + 9, spacePos - emuPathPos - 9); command.substr(emuPathPos + 9, spacePos - emuPathPos - 9);
if (hasQuotationMark) { if (hasQuotationMark) {
coreRaw.pop_back(); coreRaw.pop_back();
@ -933,9 +933,9 @@ void FileData::launchGame(Window* window)
if (stringPos != std::string::npos) { if (stringPos != std::string::npos) {
#if defined (_WIN64) #if defined (_WIN64)
coreFile = Utils::String::replace(coreFile.replace(stringPos, 9, coreFile = Utils::String::replace(coreFile.replace(stringPos, 9,
Utils::FileSystem::getParent(emuPath)), "/", "\\"); Utils::FileSystem::getParent(binaryPath)), "/", "\\");
#else #else
coreFile = coreFile.replace(stringPos, 9, Utils::FileSystem::getParent(emuPath)); coreFile = coreFile.replace(stringPos, 9, Utils::FileSystem::getParent(binaryPath));
#endif #endif
} }