Merge pull request #1485 from kellyelton/master

Fixed lag window being closable and changed some text

Author: kellyelton

octgnFX/Octgn/WindowManager.cs

@@ -73,7 +73,7 @@ public static void Shutdown()
             {
                 if (UiLagWindow.IsLoaded)
                 {
-                    UiLagWindow.Close();
+                    UiLagWindow.RealClose();
                 }
 
             }

octgnFX/Octgn/Windows/UiLagWindow.xaml

@@ -2,11 +2,12 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="" Width="382" WindowStyle="SingleBorderWindow" SizeToContent="Height"
-        Background="White">
+        Background="White" ShowInTaskbar="False" ResizeMode="NoResize">
     <StackPanel>
         <Border Padding="10 5">
             <StackPanel>
-                <TextBlock Foreground="SteelBlue" FontWeight="Bold" FontSize="18" HorizontalAlignment="Center">OCTGN Is Lagging</TextBlock>
+                <TextBlock Foreground="SteelBlue" FontWeight="Bold" FontSize="18" HorizontalAlignment="Center">OCTGN Is Frozen</TextBlock>
+                <TextBlock FontWeight="Bold">This has nothing to do with your internet connection.</TextBlock>
                 <TextBlock FontWeight="Bold">Don't worry, you're still connected to your game.</TextBlock>
                 <Rectangle Height="10"/>
                 <TextBlock FontWeight="Bold">This is happening for one of the following reasons</TextBlock>

octgnFX/Octgn/Windows/UiLagWindow.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Interop;
@@ -8,6 +9,8 @@ namespace Octgn.Windows
 {
     public partial class UiLagWindow
     {
+        private bool _isClosing;
+
         [DllImport("user32.dll")]
         [return: MarshalAs(UnmanagedType.Bool)]
         static extern bool GetWindowRect(HandleRef hWnd, out RECT lpRect);
@@ -67,5 +70,21 @@ public void HideLagWindow()
             }
             this.Hide();
         }
+
+        public void RealClose()
+        {
+            this._isClosing = true;
+            this.Close();
+        }
+
+        protected override void OnClosing(CancelEventArgs e)
+        {
+            if (_isClosing == false)
+            {
+                e.Cancel = true;
+                return;
+            }
+            base.OnClosing(e);
+        }
     }
 }

recentchanges.txt

@@ -1 +1,2 @@
-
+Updated lag window so it isn't cloasable - Kelly
+Changed some text in the window - Kelly