cherrypick from net6 fixes
This commit is contained in:
@@ -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);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user