Fix for the Steam Unsubscribe Issue (tModLoader#2648)

* Maybe a possible fix for the Steam Unsubscribe Issue and If not an Error Message Improvement * Fix an Error with Mod Deletion Post-Preview System
Dobry129 · Jun 30, 2022 · 030f19a · 030f19a
1 parent 34d7b0d
commit 030f19a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/patches/tModLoader/Terraria/Localization/Content/en-US/tModLoader.json b/patches/tModLoader/Terraria/Localization/Content/en-US/tModLoader.json
@@ -93,7 +93,7 @@
 		"ModAlreadyUploaded": "Error: Mod already exists on Workshop!",
 		"ModVersionInfoUnchanged": "Error: Mod Version information must be incremented prior to updating.",
 		"ConsultSteamLogs": "Consult Steam workshop_log.txt (Default Location: {0}) for more information.",
-		"SteamRejectUpdate": "Item is/was already installed: {0}. \nIf attempting to re-install, restart your game first because Steam is weird",
+		"SteamRejectUpdate": "Item is/was already installed: {0}. \nIf attempting to re-install, restart your game first because Steam is weird\nIf restarting your game does not work, apply the following steps:\n1) Open Steam Client\n2)Find the Mod on tModLoader Workshop\n3)Unsubscribe and Resubscribe on the actual Workshop.\nThese steps are required if Steam fails to handle unsubscribing you properly.",
 		"BrowserRejectWarning": "Can't Download. Click For Info",
 		"BeginDownload": "Attempting Download Item: {0}",
 		"EndDownload": "Item Download Completed",

diff --git a/patches/tModLoader/Terraria/ModLoader/Core/ModOrganizer.cs b/patches/tModLoader/Terraria/ModLoader/Core/ModOrganizer.cs
@@ -529,7 +529,7 @@ internal static bool TryReadManifest(string parentDir, out FoundWorkshopEntryInf
 
 		internal static string GetParentDir(string tmodPath) {
 			string parentDir = Directory.GetParent(tmodPath).ToString();
-			if (!tmodPath.Contains(Path.Combine("steamapps", "workshop")))
+			if (!tmodPath.Contains("workshop", StringComparison.InvariantCultureIgnoreCase))
 				return parentDir;
 
 			var match = PublishFolderMetadata.Match(parentDir + Path.DirectorySeparatorChar);

diff --git a/patches/tModLoader/Terraria/Social/Steam/WorkshopHelper.TML.cs b/patches/tModLoader/Terraria/Social/Steam/WorkshopHelper.TML.cs
@@ -303,20 +303,21 @@ private void InnerDownloadQueue(UIWorkshopDownload uiProgress) {
 			}
 
 			internal void Uninstall(string installPath = null) {
-				if (String.IsNullOrEmpty(installPath))
+				if (string.IsNullOrEmpty(installPath))
 					installPath = GetInstallInfo().installPath;
 
 				if (!Directory.Exists(installPath))
 					return;
 
-				// Remove the files
-				Directory.Delete(installPath, true);
-
 				// Unsubscribe
 				if (SteamUser)
 					SteamUGC.UnsubscribeItem(itemID);
 
-				UninstallACF();
+				// Remove the files
+				Directory.Delete(installPath, true);
+
+				if (!SteamUser)
+					UninstallACF();
 			}
 
 			private void UninstallACF() {