From 5b9b8a71ebe718d483e4003013b5b37a2ed59ca0 Mon Sep 17 00:00:00 2001
From: Delta <46466697+DeltaGW2@users.noreply.github.com>
Date: Mon, 10 Jun 2024 15:47:17 +0200
Subject: [PATCH] hotfixes

---
 src/GUI/Widgets/Addons/AddonItem.cpp |  1 -
 src/Loader/Loader.cpp                | 38 ----------------------------
 src/Updater/Updater.cpp              |  2 +-
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/src/GUI/Widgets/Addons/AddonItem.cpp b/src/GUI/Widgets/Addons/AddonItem.cpp
index 99bfa10..16fa488 100644
--- a/src/GUI/Widgets/Addons/AddonItem.cpp
+++ b/src/GUI/Widgets/Addons/AddonItem.cpp
@@ -87,7 +87,6 @@ namespace GUI
 			}
 		}
 
-
 		if (!BtnOptions) { BtnOptions = TextureLoader::GetOrCreate("ICON_OPTIONS", RES_ICON_OPTIONS, NexusHandle); }
 		if (!CtxMenuBullet) { CtxMenuBullet = TextureLoader::GetOrCreate("TEX_CTXMENU_BULLET", RES_TEX_CONTEXTMENU_BULLET, NexusHandle); }
 		if (!CtxMenuHighlight) { CtxMenuHighlight = TextureLoader::GetOrCreate("TEX_CTXMENU_HIGHLIGHT", RES_TEX_CONTEXTMENU_HIGHLIGHT, NexusHandle); }
diff --git a/src/Loader/Loader.cpp b/src/Loader/Loader.cpp
index ab26e0e..5976140 100644
--- a/src/Loader/Loader.cpp
+++ b/src/Loader/Loader.cpp
@@ -506,42 +506,6 @@ namespace Loader
 						LogDebug(CH_LOADER, "%s", fErr.what());
 					}
 				}
-				else if (path.extension() == extOld)
-				{
-					std::filesystem::path actualPath = path.string().substr(0, path.string().length() - extOld.length());
-
-					Addon* addon = FindAddonByPath(actualPath);
-
-					/* not orphaned, will be handled by loader */
-					if (addon) { continue; }
-
-					try
-					{
-						std::filesystem::remove(path);
-					}
-					catch (std::filesystem::filesystem_error fErr)
-					{
-						LogDebug(CH_LOADER, "%s", fErr.what());
-					}
-				}
-				else if (path.extension() == extUpdate)
-				{
-					std::filesystem::path actualPath = path.string().substr(0, path.string().length() - extUpdate.length());
-
-					Addon* addon = FindAddonByPath(actualPath);
-
-					/* not orphaned, will be handled by loader */
-					if (addon) { continue; }
-
-					try
-					{
-						std::filesystem::rename(path, actualPath);
-					}
-					catch (std::filesystem::filesystem_error fErr)
-					{
-						LogDebug(CH_LOADER, "%s", fErr.what());
-					}
-				}
 			}
 			
 			IsSuspended = true;
@@ -846,8 +810,6 @@ namespace Loader
 		Events::Raise(EV_ADDON_LOADED, &addon->Definitions->Signature);
 		Events::Raise(EV_MUMBLE_IDENTITY_UPDATED, Mumble::IdentityParsed);
 
-		SortAddons();
-
 		addon->State = locked ? EAddonState::LoadedLOCKED : EAddonState::Loaded;
 		SaveAddonConfig();
 
diff --git a/src/Updater/Updater.cpp b/src/Updater/Updater.cpp
index e25dc41..aa555f7 100644
--- a/src/Updater/Updater.cpp
+++ b/src/Updater/Updater.cpp
@@ -375,7 +375,7 @@ bool CUpdater::InstallAddon(LibraryAddon* aAddon, bool aIsArcPlugin)
 	std::filesystem::path installPath = Path::D_GW2_ADDONS / (filename + ".dll");
 	installPath = GetUnclaimedPath(installPath);
 
-	if (this->UpdateAddon(installPath, addonInfo, true))
+	if (this->UpdateAddon(installPath, addonInfo, aIsArcPlugin))
 	{
 		try
 		{