sbrl-github/Nibriboard
1
0
Fork 0
mirror of https://github.com/sbrl/Nibriboard.git synced 2018-01-10 21:33:49 +00:00
Code Activity

Fix a few lingering issues after fixing problems in GlidingSquirrel. It works! :D :D :D

Browse source
This commit is contained in:
Starbeamrainbowlabs 2017-09-20 22:39:14 +01:00
parent be258f63dc
commit ccf06ec976
5 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Nibriboard.sln
View file

@ -1,13 +1,13 @@
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012 # 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}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{63B62AF1-5ED2-4051-8AB1-6186A1D9199E}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
README.md = README.md README.md = README.md
EndProjectSection EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nibriboard", "Nibriboard\Nibriboard.csproj", "{B7F806D9-9C50-4BA8-A803-0FC2EC5F5932}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86 Debug|x86 = Debug|x86

6
Nibriboard/Client/NibriClient.cs
View file

@ -67,7 +67,7 @@ namespace Nibriboard.Client
/// </summary> /// </summary>
public bool Connected { public bool Connected {
get { get {
return connection.IsClosing; return !connection.IsClosing;
} }
} }
/// <summary> /// <summary>
@ -207,7 +207,7 @@ namespace Nibriboard.Client
} }
} }
/// <summary> /// <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. /// Use the regular Send() method if you can possibly help it.
/// </summary> /// </summary>
/// <param name="message">The message to send.</param> /// <param name="message">The message to send.</param>
@ -245,7 +245,7 @@ namespace Nibriboard.Client
// Tell the client that we're shutting down // Tell the client that we're shutting down
Send(lastMessage); Send(lastMessage);
await connection.Close(WebsocketCloseReason.Normal); await connection.Close(WebsocketCloseReason.Normal, "Goodbye!");
} }
/// <summary> /// <summary>

15
Nibriboard/Nibriboard.csproj
View file

@ -26,6 +26,11 @@
<command>npm run build</command> <command>npm run build</command>
<workingdir>${ProjectDir}/ClientFiles</workingdir> <workingdir>${ProjectDir}/ClientFiles</workingdir>
</Command> </Command>
<Command>
<type>BeforeBuild</type>
<command>msbuild</command>
<workingdir>${ProjectDir}/lib/GlidingSquirrel/GlidingSquirrel</workingdir>
</Command>
</CustomCommands> </CustomCommands>
</CustomCommands> </CustomCommands>
<Externalconsole>true</Externalconsole> <Externalconsole>true</Externalconsole>
@ -51,9 +56,13 @@
<Reference Include="SharpCompress"> <Reference Include="SharpCompress">
<HintPath>..\packages\SharpCompress.0.18.1\lib\net45\SharpCompress.dll</HintPath> <HintPath>..\packages\SharpCompress.0.18.1\lib\net45\SharpCompress.dll</HintPath>
</Reference> </Reference>
<Reference Include="GlidingSquirrel"> </ItemGroup>
<HintPath>lib\GlidingSquirrel\GlidingSquirrel\bin\Debug\GlidingSquirrel.dll</HintPath> <ItemGroup>
</Reference> <ProjectReference Include="lib\GlidingSquirrel\GlidingSquirrel\GlidingSquirrel.csproj">
<Project>{476D3588-4FEE-4C75-874F-214E26B8AC1A}</Project>
<Name>GlidingSquirrel</Name>
<IncludeInPackage>false</IncludeInPackage>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />

17
Nibriboard/Nibriboard.sln
View file

@ -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

2
Nibriboard/lib/GlidingSquirrel

@ -1 +1 @@
Subproject commit e59dd72dd475b685ede1a05258ea0369bdcbc8c1 Subproject commit 8ce983489be64fd298d3e847711ca4a38bb7d429