Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-09-13 04:55:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct logic for sanitize_string_for_path. Fixes #286 and compatibility with Pokemon games from master branch.

Browse Source
This commit is contained in:
J-D-K
2025-09-06 20:14:28 -04:00
parent e658545a48
commit 8653e9b033
8 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/appstates/BackupMenuState.cpp
View File

@@ -297,7 +297,7 @@ void BackupMenuState::confirm_restore()
{
const char *popBackupEmpty = strings::get_by_name(strings::names::BACKUPMENU_POPS, 1);
const fslib::Path target = m_directoryPath / m_directoryListing[entry.index];
const fslib::Path target{m_directoryPath / m_directoryListing[entry.index]};
const bool targetIsDirectory = fslib::directory_exists(target);
const bool backupIsGood = targetIsDirectory ? fs::directory_has_contents(target) : fs::zip_has_contents(target);
if (!backupIsGood)
@@ -359,9 +359,8 @@ void BackupMenuState::upload_backup()
const MenuEntry &entry = m_menuEntries[selected];
if (entry.type != BackupMenuState::MenuEntryType::Local) { return; }
const char *targetName = m_directoryListing[entry.index].get_filename();
fslib::Path target = m_directoryPath / targetName;
const bool isDir = fslib::directory_exists(target);
fslib::Path target{m_directoryPath / m_directoryListing[entry.index]};
const bool isDir = fslib::directory_exists(target);
if (isDir)
{
const char *popNotZip = strings::get_by_name(strings::names::BACKUPMENU_POPS, 13);