nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Attempt to correct Linux appimage behavior. (#6215)

Browse Source 
Also make Windows rom search react to the set search path.
This commit is contained in:
Malkierian
2026-02-01 11:35:54 -07:00
committed by GitHub
parent a4eacdd267
commit cc0941cc9f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
soh/soh/Extractor/Extract.cpp
View File

@@ -229,7 +229,8 @@ void Extractor::FilterRoms(std::vector<std::string>& roms, RomSearchMode searchM
void Extractor::GetRoms(std::vector<std::string>& roms) { void Extractor::GetRoms(std::vector<std::string>& roms) {
#ifdef _WIN32 #ifdef _WIN32
WIN32_FIND_DATAA ffd; WIN32_FIND_DATAA ffd;
HANDLE h = FindFirstFileA(".\\*", &ffd); std::string search = std::string(mSearchPath + "\\*");
HANDLE h = FindFirstFileA(search.c_str(), &ffd);
do { do {
if (!(ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { if (!(ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {

3
soh/soh/OTRGlobals.cpp
View File

@@ -415,6 +415,7 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
std::atomic<size_t> extractCount = 0, totalExtract = 0; std::atomic<size_t> extractCount = 0, totalExtract = 0;
std::string installPath = Ship::Context::GetAppBundlePath(); std::string installPath = Ship::Context::GetAppBundlePath();
std::string dataPath = Ship::Context::GetAppDirectoryPath(appShortName);
std::string file; std::string file;
#if defined(__SWITCH__) #if defined(__SWITCH__)
@@ -632,6 +633,8 @@ void OTRGlobals::RunExtract(int argc, char* argv[]) {
extract = Extractor(); extract = Extractor();
extract.SetSearchPath(installPath); extract.SetSearchPath(installPath);
extract.GetRoms(args); extract.GetRoms(args);
extract.SetSearchPath(dataPath);
extract.GetRoms(args);
if (!args.empty()) { if (!args.empty()) {
promptStep = PS_WAIT; promptStep = PS_WAIT;
SohGui::RegisterPopup( SohGui::RegisterPopup(