From 100aba090003120378e810ace40bfb2a92ea21ef Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Tue, 6 Sep 2022 13:43:11 +0200
Subject: [PATCH] cherrypick from net6 fixes

---
 MareSynchronos/Managers/IpcManager.cs | 4 ++--
 MareSynchronos/UI/CompactUI.cs        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MareSynchronos/Managers/IpcManager.cs b/MareSynchronos/Managers/IpcManager.cs
index a71942a..bacd7ec 100644
--- a/MareSynchronos/Managers/IpcManager.cs
+++ b/MareSynchronos/Managers/IpcManager.cs
@@ -263,12 +263,12 @@ namespace MareSynchronos.Managers
 
             actionQueue.Enqueue(() =>
             {
-                Logger.Verbose("Assigning temp mods for " + collectionName);
+                Logger.Verbose("Assigning temp mods for " + characterName);
                 foreach (var mod in modPaths)
                 {
                     Logger.Verbose(mod.Key + " => " + mod.Value);
                 }
-                _penumbraSetTemporaryMod.InvokeFunc("MareSynchronos", collectionName, modPaths, manipulationData, 0);
+                _penumbraSetTemporaryMod.InvokeFunc("MareSynchronos", characterName, modPaths, manipulationData, 0);
             });
         }
 
diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs
index c40692a..299c590 100644
--- a/MareSynchronos/UI/CompactUI.cs
+++ b/MareSynchronos/UI/CompactUI.cs
@@ -34,7 +34,9 @@ namespace MareSynchronos.UI
         private float _windowContentWidth = 0;
 
         public CompactUi(WindowSystem windowSystem,
-            UiShared uiShared, Configuration configuration, ApiController apiController)
+            UiShared uiShared, Configuration configuration, ApiController apiController) : base("###MareSynchronosMainUI")
+        {
+
 #if DEBUG
             string dateTime = "DEV VERSION";
             try
@@ -49,10 +51,8 @@ namespace MareSynchronos.UI
             }
             this.WindowName = "Mare Synchronos " + dateTime + "###MareSynchronosMainUI";
 #else
-            : base("Mare Synchronos " + Assembly.GetExecutingAssembly().GetName().Version + "###MareSynchronosMainUI")
+            this.WindowName = "Mare Synchronos " + Assembly.GetExecutingAssembly().GetName().Version;
 #endif
-
-        {
             Logger.Verbose("Creating " + nameof(CompactUi));
 
             _windowSystem = windowSystem;