From 75b1249866d6e0a8982c59884e1482953f866879 Mon Sep 17 00:00:00 2001
From: Steve Sharp <steve@bitbaboon.net>
Date: Tue, 28 Apr 2020 19:43:08 +0100
Subject: [PATCH] Server version fix

---
 EVEData/ZKillRedisQ.cs | 9 +--------
 MainWindow.xaml        | 6 +++---
 MainWindow.xaml.cs     | 5 +++++
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/EVEData/ZKillRedisQ.cs b/EVEData/ZKillRedisQ.cs
index e4b57134..437d9d65 100644
--- a/EVEData/ZKillRedisQ.cs
+++ b/EVEData/ZKillRedisQ.cs
@@ -20,17 +20,10 @@ namespace SMT.EVEData
     /// </summary>
     public class ZKillRedisQ
     {
-        private Thread updateThread;
-        private bool updateThreadRunning = true;
         private BackgroundWorker backgroundWorker;
 
 
-        ~ZKillRedisQ()
-        {
-            updateThreadRunning = false;
-        }
-
-        /// <summary>
+         /// <summary>
         /// Gets or sets the Stream of the last few kills from ZKillBoard
         /// </summary>
         public ObservableCollection<ZKBDataSimple> KillStream { get; set; }
diff --git a/MainWindow.xaml b/MainWindow.xaml
index cc80ef85..4eae8e7e 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -57,7 +57,7 @@
             </StatusBarItem>
 
             <StatusBarItem>
-                <TextBlock Text="{Binding Path=EVEManager.ServerInfo.ServerTime, StringFormat=HH:mm}" Foreground="White" />
+                <TextBlock Text="{Binding Path=ServerTime, StringFormat=HH:mm}" Foreground="White" />
             </StatusBarItem>
 
             <Separator />
@@ -67,13 +67,13 @@
             </StatusBarItem>
 
             <StatusBarItem>
-                <TextBlock Text="{Binding Path=EVEManager.ServerInfo.ServerVersion}" Foreground="White"/>
+                <TextBlock Text="{Binding Path=ServerVersion}" Foreground="White"/>
             </StatusBarItem>
 
             <Separator />
 
             <StatusBarItem>
-                <TextBlock Text="{Binding Path=EVEManager.ServerInfo.NumPlayers}" Foreground="White"/>
+                <TextBlock Text="{Binding Path=NumPlayers}" Foreground="White"/>
             </StatusBarItem>
 
             <StatusBarItem >
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index ae7f4270..084db118 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -44,8 +44,11 @@ public MainWindow()
             AppWindow = this;
             DataContext = this;
 
+
             InitializeComponent();
 
+
+
             Title = "SMT (CYNO23 NEWS : " + SMTVersion + ")";
 
             CheckGitHubVersion();
@@ -142,6 +145,8 @@ public MainWindow()
             UniverseUC.Init();
             UniverseUC.RequestRegionSystem += UniverseUC_RequestRegionSystem;
 
+            AppStatusBar.DataContext = EVEManager.ServerInfo;
+
             // load the anom data
             string anomDataFilename = EVEManager.SaveDataFolder + @"\Anoms.dat";
             if (File.Exists(anomDataFilename))