From ccf06ec976da3e5ea725ff43ac6ae62d5dc7b7bc Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Wed, 20 Sep 2017 22:39:14 +0100
Subject: [PATCH] Fix a few lingering issues after fixing problems in
 GlidingSquirrel. It works! :D :D :D

---
 Nibriboard.sln                   |  4 ++--
 Nibriboard/Client/NibriClient.cs |  6 +++---
 Nibriboard/Nibriboard.csproj     | 15 ++++++++++++---
 Nibriboard/Nibriboard.sln        | 17 -----------------
 Nibriboard/lib/GlidingSquirrel   |  2 +-
 5 files changed, 18 insertions(+), 26 deletions(-)
 delete mode 100644 Nibriboard/Nibriboard.sln

diff --git a/Nibriboard.sln b/Nibriboard.sln
index 33af7f5..05a9f96 100644
--- a/Nibriboard.sln
+++ b/Nibriboard.sln
@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nibriboard", "Nibriboard\Nibriboard.csproj", "{B7F806D9-9C50-4BA8-A803-0FC2EC5F5932}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{63B62AF1-5ED2-4051-8AB1-6186A1D9199E}"
 	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nibriboard", "Nibriboard\Nibriboard.csproj", "{B7F806D9-9C50-4BA8-A803-0FC2EC5F5932}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
diff --git a/Nibriboard/Client/NibriClient.cs b/Nibriboard/Client/NibriClient.cs
index 790a141..790b541 100644
--- a/Nibriboard/Client/NibriClient.cs
+++ b/Nibriboard/Client/NibriClient.cs
@@ -67,7 +67,7 @@ namespace Nibriboard.Client
 		/// </summary>
 		public bool Connected {
 			get {
-				return connection.IsClosing;
+				return !connection.IsClosing;
 			}
 		}
 		/// <summary>
@@ -207,7 +207,7 @@ namespace Nibriboard.Client
 			}
 		}
 		/// <summary>
-		/// Sends a raw string to the client. Don't use unnless you know what you're doing!
+		/// Sends a raw string to the client. Don't use unless you know what you're doing!
 		/// Use the regular Send() method if you can possibly help it.
 		/// </summary>
 		/// <param name="message">The message to send.</param>
@@ -245,7 +245,7 @@ namespace Nibriboard.Client
 			// Tell the client that we're shutting down
 			Send(lastMessage);
 
-			await connection.Close(WebsocketCloseReason.Normal);
+			await connection.Close(WebsocketCloseReason.Normal, "Goodbye!");
 		}
 
 		/// <summary>
diff --git a/Nibriboard/Nibriboard.csproj b/Nibriboard/Nibriboard.csproj
index 3adc467..c07ae6c 100644
--- a/Nibriboard/Nibriboard.csproj
+++ b/Nibriboard/Nibriboard.csproj
@@ -26,6 +26,11 @@
           <command>npm run build</command>
           <workingdir>${ProjectDir}/ClientFiles</workingdir>
         </Command>
+        <Command>
+          <type>BeforeBuild</type>
+          <command>msbuild</command>
+          <workingdir>${ProjectDir}/lib/GlidingSquirrel/GlidingSquirrel</workingdir>
+        </Command>
       </CustomCommands>
     </CustomCommands>
     <Externalconsole>true</Externalconsole>
@@ -51,9 +56,13 @@
     <Reference Include="SharpCompress">
       <HintPath>..\packages\SharpCompress.0.18.1\lib\net45\SharpCompress.dll</HintPath>
     </Reference>
-    <Reference Include="GlidingSquirrel">
-      <HintPath>lib\GlidingSquirrel\GlidingSquirrel\bin\Debug\GlidingSquirrel.dll</HintPath>
-    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="lib\GlidingSquirrel\GlidingSquirrel\GlidingSquirrel.csproj">
+      <Project>{476D3588-4FEE-4C75-874F-214E26B8AC1A}</Project>
+      <Name>GlidingSquirrel</Name>
+      <IncludeInPackage>false</IncludeInPackage>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
diff --git a/Nibriboard/Nibriboard.sln b/Nibriboard/Nibriboard.sln
deleted file mode 100644
index 12f9f7b..0000000
--- a/Nibriboard/Nibriboard.sln
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nibriboard", "Nibriboard.csproj", "{B7F806D9-9C50-4BA8-A803-0FC2EC5F5932}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B7F806D9-9C50-4BA8-A803-0FC2EC5F5932}.Debug|x86.ActiveCfg = Debug|x86
-		{B7F806D9-9C50-4BA8-A803-0FC2EC5F5932}.Debug|x86.Build.0 = Debug|x86
-		{B7F806D9-9C50-4BA8-A803-0FC2EC5F5932}.Release|x86.ActiveCfg = Release|x86
-		{B7F806D9-9C50-4BA8-A803-0FC2EC5F5932}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-EndGlobal
diff --git a/Nibriboard/lib/GlidingSquirrel b/Nibriboard/lib/GlidingSquirrel
index e59dd72..8ce9834 160000
--- a/Nibriboard/lib/GlidingSquirrel
+++ b/Nibriboard/lib/GlidingSquirrel
@@ -1 +1 @@
-Subproject commit e59dd72dd475b685ede1a05258ea0369bdcbc8c1
+Subproject commit 8ce983489be64fd298d3e847711ca4a38bb7d429