fix uninstalled addons showing up in lib when locked

RaidcoreGG · Mar 3, 2024 · 050b4d0 · 050b4d0
1 parent d8d94b3
commit 050b4d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/GUI/Widgets/Addons/AddonItem.cpp b/src/GUI/Widgets/Addons/AddonItem.cpp
@@ -38,7 +38,8 @@ namespace GUI
 		if (aAddon == nullptr ||
 			aAddon->Definitions == nullptr ||
 			aAddon->State == EAddonState::NotLoadedDuplicate ||
-			aAddon->State == EAddonState::NotLoadedIncompatible)
+			aAddon->State == EAddonState::NotLoadedIncompatible ||
+			aAddon->WillBeUninstalled)
 		{
 			return;
 		}

diff --git a/src/Loader/Addon.h b/src/Loader/Addon.h
@@ -17,6 +17,7 @@ struct Addon
 	AddonDefinition*			Definitions;
 	bool						ShouldDisableNextLaunch;
 	bool						IsPausingUpdates;
+	bool						WillBeUninstalled;
 };
 
 #endif
diff --git a/src/Loader/Loader.cpp b/src/Loader/Loader.cpp
@@ -804,7 +804,7 @@ namespace Loader
 				try
 				{
 					std::filesystem::rename(aPath, aPath.string() + extUninstall);
-					Addons.erase(aPath); // remove from addons list anyway
+					it->second->WillBeUninstalled = true;
 					LogWarning(CH_LOADER, "Addon is stilled loaded, it will be uninstalled the next time the game is restarted: %s", aPath.string().c_str());
 				}
 				catch (std::filesystem::filesystem_error fErr)