ToxicMushroom/mare.client
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.client.git synced 2025-12-13 18:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cherrypick from net6 fixes

Browse source
This commit is contained in:
Stanley Dimant 2022-09-06 13:43:11 +02:00
parent dd74b7be86
commit 100aba0900
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MareSynchronos/Managers/IpcManager.cs
View file

@ -263,12 +263,12 @@ namespace MareSynchronos.Managers
actionQueue.Enqueue(() => actionQueue.Enqueue(() =>
{ {
Logger.Verbose("Assigning temp mods for " + collectionName); Logger.Verbose("Assigning temp mods for " + characterName);
foreach (var mod in modPaths) foreach (var mod in modPaths)
{ {
Logger.Verbose(mod.Key + " => " + mod.Value); Logger.Verbose(mod.Key + " => " + mod.Value);
} }
_penumbraSetTemporaryMod.InvokeFunc("MareSynchronos", collectionName, modPaths, manipulationData, 0); _penumbraSetTemporaryMod.InvokeFunc("MareSynchronos", characterName, modPaths, manipulationData, 0);
}); });
} }

8
MareSynchronos/UI/CompactUI.cs
View file

@ -34,7 +34,9 @@ namespace MareSynchronos.UI
private float _windowContentWidth = 0; private float _windowContentWidth = 0;
public CompactUi(WindowSystem windowSystem, public CompactUi(WindowSystem windowSystem,
UiShared uiShared, Configuration configuration, ApiController apiController) UiShared uiShared, Configuration configuration, ApiController apiController) : base("###MareSynchronosMainUI")
{
#if DEBUG #if DEBUG
string dateTime = "DEV VERSION"; string dateTime = "DEV VERSION";
try try
@ -49,10 +51,8 @@ namespace MareSynchronos.UI
} }
this.WindowName = "Mare Synchronos " + dateTime + "###MareSynchronosMainUI"; this.WindowName = "Mare Synchronos " + dateTime + "###MareSynchronosMainUI";
#else #else
: base("Mare Synchronos " + Assembly.GetExecutingAssembly().GetName().Version + "###MareSynchronosMainUI") this.WindowName = "Mare Synchronos " + Assembly.GetExecutingAssembly().GetName().Version;
#endif #endif
{
Logger.Verbose("Creating " + nameof(CompactUi)); Logger.Verbose("Creating " + nameof(CompactUi));
_windowSystem = windowSystem; _windowSystem = windowSystem;