Skip to content

Commit 7ea1af9

Browse files
committed
fix some bugs
1 parent bf54bff commit 7ea1af9

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

mod.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"geode": "4.7.0",
2+
"geode": "4.8.0",
33
"gd": {
44
"win": "2.2074",
55
"android": "2.2074",
66
"mac": "2.2074",
77
"ios": "2.2074"
88
},
9-
"version": "1.4.9",
9+
"version": "1.4.10",
1010
"id": "km7dev.gdps-switcher",
1111
"name": "GDPS Switcher",
1212
"developers": ["km7dev", "Alphii"],

src/utils/GDPSMain.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,15 @@ geode::Result<> GDPSMain::modifyRegisteredServer(GDPSTypes::Server& server) {
145145
return geode::Err(fmt::format("Save directory \"{}\" already exists!", path));
146146
}
147147
if (errCode) {
148-
return geode::Err("Error checking validity of save directory!");
148+
return geode::Err("Error checking validity of save directory: {}", errCode.message());
149149
}
150150

151-
std::filesystem::rename(geode::dirs::getSaveDir() / "gdpses" / m_servers[server.id].saveDir, path);
151+
log::info("{}", geode::dirs::getSaveDir() / "gdpses" / m_servers [server.id].saveDir);
152+
153+
std::filesystem::rename(geode::dirs::getSaveDir() / "gdpses" / m_servers[server.id].saveDir, path, errCode);
154+
if (errCode) {
155+
return geode::Err("Error moving save directory: {}", errCode.message());
156+
}
152157
}
153158

154159
m_servers[server.id].name = server.name;
@@ -190,7 +195,7 @@ geode::Result<> GDPSMain::deleteServer(GDPSTypes::Server& server) {
190195

191196
if (
192197
!geode::utils::string::pathToString(canonicalServerPath).starts_with(geode::utils::string::pathToString(gdpsesDir))
193-
|| serverPath != gdpsesDir
198+
|| serverPath == gdpsesDir
194199
) {
195200
return geode::Err(
196201
"Attempted to delete a path outside or equal to the gdpses directory: {}\n\n"

0 commit comments

Comments
 (0)