Skip to content

Commit bc6703c

Browse files
committed
Code works! Gonna trim out unnecessary stuff from here before merge
1 parent 223155a commit bc6703c

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Source/Core/Core/Config/MainSettings.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,14 @@ static Info<std::string> MakeISOPathConfigInfo(size_t idx)
334334
""};
335335
}
336336

337-
// Functions below DO work when the launcher path is set manually instead of pulling from Config; try to find why these functions can't pull the path properly
337+
// P+ change: Get/SetIsoPaths modified to include launcher path by default, preventing us from needing to ship Dolphin.ini
338338

339339
std::vector<std::string> GetIsoPaths()
340340
{
341341
std::vector<std::string> paths;
342342

343-
// Always insert the launcher path — even if it's empty
344-
paths.emplace_back(Config::Get(Config::MAIN_LAUNCHER_PATH));
343+
// Always insert the launcher path
344+
paths.emplace_back(File::GetUserPath(D_LAUNCHERS_IDX));
345345

346346
size_t count = MathUtil::SaturatingCast<size_t>(Config::Get(Config::MAIN_ISO_PATH_COUNT));
347347
paths.reserve(count + 1);
@@ -359,11 +359,11 @@ std::vector<std::string> GetIsoPaths()
359359
void SetIsoPaths(const std::vector<std::string>& paths)
360360
{
361361
size_t old_size = MathUtil::SaturatingCast<size_t>(Config::Get(Config::MAIN_ISO_PATH_COUNT));
362-
std::string launcher_path = Config::Get(Config::MAIN_LAUNCHER_PATH);
362+
std::string launcher_path = File::GetUserPath(D_LAUNCHERS_IDX);
363363

364364
size_t current_path_idx = 0;
365365

366-
// Start from index 1, assuming launcher path is at index 0
366+
// P+ change: start from index 1, assuming launcher path is at index 0
367367
for (size_t i = 1; i < paths.size(); ++i)
368368
{
369369
const std::string& p = paths[i];
@@ -375,7 +375,6 @@ void SetIsoPaths(const std::vector<std::string>& paths)
375375
++current_path_idx;
376376
}
377377

378-
// Clear out old entries if any
379378
for (size_t i = current_path_idx; i < old_size; ++i)
380379
{
381380
Config::SetBase(MakeISOPathConfigInfo(i), "");

0 commit comments

Comments
 (0)