7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-23 03:15:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

prevent updater from hanging, also copy pdb

Browse source
This commit is contained in:
matcool 2024-02-26 12:31:18 -03:00
parent a5475bda11
commit d139049b89
1 changed files with 22 additions and 12 deletions

34
loader/launcher/windows/Updater.cpp
View file

@ -22,33 +22,39 @@ bool waitForFile(std::filesystem::path const& path) {
if (GetLastError() == ERROR_SHARING_VIOLATION) {
Sleep(delay);
// the delay would raise and go up to about 5 seconds, after which it will fail
if (delay < 5120)
if (delay < 5120) {
delay *= 2;
}
else
} else {
// delay too long, just give up now
hFile = NULL;
break;
}
} else {
break;
}
}
if (hFile)
if (hFile) {
CloseHandle(hFile);
else {
} else {
showError("Unable to update Geode: " + path.filename().string() + " is open by another process.");
return false;
}
return true;
}
void updateFile(std::string const& name) {
bool updateFile(std::string const& name) {
std::error_code error;
if (!std::filesystem::exists(updatesDir / name, error) || error)
return;
return true;
if (!waitForFile(workingDir / name))
return;
return false;
std::filesystem::rename(updatesDir / name, workingDir / name, error);
if (error) {
showError("Unable to update Geode: Unable to move " + name + " - " + error.message());
return;
return false;
}
return true;
}
void removePath(std::filesystem::path const& path) {
@ -98,10 +104,14 @@ int main(int argc, char* argv[]) {
removePath(workingDir / "GeodeBootstrapper.dll");
if (std::filesystem::exists(geodeDir) && std::filesystem::exists(updatesDir)) {
updateFile("XInput9_1_0.dll");
updateFile("Geode.dll");
bool updateSuccess = true;
updateSuccess &= updateFile("XInput9_1_0.dll");
updateSuccess &= updateFile("Geode.dll");
updateSuccess &= updateFile("Geode.pdb");
updateResources();
removePath(updatesDir);
// if couldnt update the files, dont delete the updates folder
if (updateSuccess)
removePath(updatesDir);
}
if (argc < 2)