From fb115e9c5b89bdd19705eb7ac6f555f419831b59 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Sun, 7 Aug 2022 19:56:46 +1000
Subject: [PATCH] Code Cleanup

---
 .../UserControls/ServerSettingsControl.xaml.cs                 | 3 ++-
 .../UserControls/ServerSettingsControl.xaml.cs                 | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
index a6766b9d..10ad2657 100644
--- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
+++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
@@ -799,7 +799,8 @@ namespace ServerManagerTool
                 }
 
                 // <data folder>\SteamCMD\steamapps\workshop\content\<app id>
-                var workshopPath = string.Format(Config.Default.AppSteamWorkshopFolderRelativePath, this.Settings.SOTF_Enabled ? Config.Default.AppId_SotF : Config.Default.AppId);
+                var appId = this.Settings.SOTF_Enabled ? Config.Default.AppId_SotF : Config.Default.AppId;
+                var workshopPath = string.Format(Config.Default.AppSteamWorkshopFolderRelativePath, appId);
                 folder = Path.Combine(Config.Default.DataDir, Config.Default.SteamCmdDir, workshopPath);
                 if (Directory.Exists(folder))
                 {
diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs
index 9b23ee2a..855ebaca 100644
--- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs
+++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs
@@ -589,7 +589,8 @@ namespace ServerManagerTool
                 }
 
                 // <data folder>\SteamCMD\steamapps\workshop\content\<app id>
-                var workshopPath = string.Format(Config.Default.AppSteamWorkshopFolderRelativePath, this.Settings.UseTestlive ? Config.Default.AppId_Testlive : Config.Default.AppId);
+                var appId = this.Settings.UseTestlive ? Config.Default.AppId_Testlive : Config.Default.AppId;
+                var workshopPath = string.Format(Config.Default.AppSteamWorkshopFolderRelativePath, appId);
                 folder = Path.Combine(Config.Default.DataPath, CommonConfig.Default.SteamCmdRelativePath, workshopPath);
                 if (Directory.Exists(folder))
                 {