ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 3994a9446f into 4d0cf1315e

This commit is contained in:
Dentomologist 2025-07-28 16:33:13 -05:00 committed by GitHub
parent 4d0cf1315e 3994a9446f
commit e9b402d873
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/UICommon/AutoUpdate.cpp
View File

@ -79,9 +79,9 @@ std::string MakeUpdaterCommandLine(const std::map<std::string, std::string>& fla
return cmdline;
}
#ifdef __APPLE__
void CleanupFromPreviousUpdate()
{
#ifdef __APPLE__
// Remove the relocated updater file.
File::DeleteDirRecursively(UpdaterPath(true));
@ -90,9 +90,12 @@ void CleanupFromPreviousUpdate()
// version with an embedded updater, it won't delete the folder structure of the bundle, so
// we should clean those leftovers up.
File::DeleteDirRecursively(File::GetExeDirectory() + DIR_SEP + "Dolphin Updater.app");
}
#endif
// Updater.log was moved from GetExeDirectory() to GetUserPath(D_LOGS_IDX) in 5.0-14529.
File::Delete(File::GetExeDirectory() + DIR_SEP + "Updater.log",
File::IfAbsentBehavior::NoConsoleWarning);
}
#endif
// This ignores i18n because most of the text in there (change descriptions) is only going to be
@ -190,7 +193,7 @@ void AutoUpdateChecker::CheckForUpdate(std::string_view update_track,
if (!SystemSupportsAutoUpdates() || update_track.empty())
return;
#ifdef __APPLE__
#ifdef OS_SUPPORTS_UPDATER
CleanupFromPreviousUpdate();
#endif