Server version fix

Slazanger · Apr 28, 2020 · 75b1249 · 75b1249
1 parent a0960fb
commit 75b1249
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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))