Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

making requested changes

Browse source
This commit is contained in:
danteruiz 2019-11-04 15:20:37 -08:00
parent 35ed5031a3
commit c8dade2060
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
launchers/qt/src/LauncherInstaller_windows.cpp
View file

@ -150,19 +150,35 @@ void LauncherInstaller::uninstall() {
qDebug() << "Failed to complete uninstall launcher";
}
return;
} else {
bool deletedHQLauncherExe = deleteHQLauncherExecutable();
if (deletedHQLauncherExe) {
qDebug() << "Deleteing registry keys";
deleteApplicationRegistryKeys();
}
}
}
bool LauncherInstaller::deleteHQLauncherExecutable() {
static const int MAX_DELETE_ATTEMPTS = 3;
int deleteAttempts = 0;
bool fileRemoved = false;
QString launcherPath = _launcherInstallDir.absoluteFilePath("HQ Launcher.exe");
while (deleteAttempts < MAX_DELETE_ATTEMPTS) {
fileRemoved = QFile::remove(launcherPath);
if (fileRemoved) {
break;
}
timeDelay();
deleteAttempts++;
}
if (options->contains("--resumeUninstall")) {
// delaying time here to make sure that the previous process exits
// before we try to delete it the file.
timeDelay();
}
QString launcherPath = _launcherInstallDir.absoluteFilePath("HQ Launcher.exe");
if (QFile::exists(launcherPath)) {
bool removed = QFile::remove(launcherPath);
qDebug() << "Successfully removed " << launcherPath << ": " << removed;
}
deleteApplicationRegistryKeys();
qDebug() << "Successfully removed " << launcherPath << ": " << fileRemoved;
return fileRemoved;
}
void LauncherInstaller::deleteShortcuts() {

1
launchers/qt/src/LauncherInstaller_windows.h
View file

@ -15,6 +15,7 @@ private:
void createApplicationRegistryKeys();
void deleteShortcuts();
void deleteApplicationRegistryKeys();
bool deleteHQLauncherExecutable();
QDir _launcherInstallDir;
QDir _launcherApplicationsDir;