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

fix more merge errors

Browse source
This commit is contained in:
Stanley Dimant 2022-09-07 22:14:10 +02:00
parent 5b97d49af7
commit b2d6e23d27
1 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
MareSynchronos/UI/CompactUI.cs
View file

@ -55,23 +55,6 @@ namespace MareSynchronos.UI
#endif #endif
Logger.Verbose("Creating " + nameof(CompactUi)); Logger.Verbose("Creating " + nameof(CompactUi));
#if DEBUG
string dateTime = "DEV VERSION";
try
{
dateTime = VariousExtensions.GetLinkerTime(Assembly.GetCallingAssembly()).ToString("yyyyMMddHHmmss");
}
catch (Exception ex)
{
Logger.Warn("Could not get assembly name");
Logger.Warn(ex.Message);
Logger.Warn(ex.StackTrace);
}
this.WindowName = "Mare Synchronos " + dateTime + "###MareSynchronosMainUI";
#else
this.WindowName = "Mare Synchronos " + Assembly.GetExecutingAssembly().GetName().Version + "###MareSynchronosMainUI";
#endif
_windowSystem = windowSystem; _windowSystem = windowSystem;
_uiShared = uiShared; _uiShared = uiShared;
_configuration = configuration; _configuration = configuration;