Published v1.1.1.0
authorStephaneLenclud
Tue, 30 Aug 2016 11:04:40 +0200
changeset 25974a66917910a
parent 258 e237c2e33545
child 260 d44943088c67
Published v1.1.1.0
Fixing Harmony client reconnection to prevent exceptions.
Server/FormMain.cs
Server/SharpDisplayManager.csproj
Server/packages.config
     1.1 --- a/Server/FormMain.cs	Tue Aug 30 03:45:45 2016 +0200
     1.2 +++ b/Server/FormMain.cs	Tue Aug 30 11:04:40 2016 +0200
     1.3 @@ -2989,7 +2989,7 @@
     1.4          {
     1.5              //Try reconnect then
     1.6  #pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
     1.7 -            ResetHarmonyAsync();
     1.8 +            BeginInvoke(new MethodInvoker(delegate () { ResetHarmonyAsync(); }));
     1.9  #pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
    1.10          }
    1.11  
    1.12 @@ -3010,7 +3010,8 @@
    1.13  
    1.14              Trace.WriteLine("Harmony: Connecting... ");
    1.15              //First create our client and login
    1.16 -            Program.HarmonyClient = new HarmonyHub.Client(iTextBoxHarmonyHubAddress.Text);
    1.17 +            //Tip: Set keep-alive to false when testing reconnection process
    1.18 +            Program.HarmonyClient = new HarmonyHub.Client(iTextBoxHarmonyHubAddress.Text, true);
    1.19              Program.HarmonyClient.OnConnectionClosedByServer += HarmonyConnectionClosedByServer;
    1.20              
    1.21              if (File.Exists("SessionToken") && !aForceAuth)
     2.1 --- a/Server/SharpDisplayManager.csproj	Tue Aug 30 03:45:45 2016 +0200
     2.2 +++ b/Server/SharpDisplayManager.csproj	Tue Aug 30 11:04:40 2016 +0200
     2.3 @@ -34,7 +34,7 @@
     2.4      <WebPage>index.htm</WebPage>
     2.5      <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     2.6      <ApplicationRevision>0</ApplicationRevision>
     2.7 -    <ApplicationVersion>1.1.0.0</ApplicationVersion>
     2.8 +    <ApplicationVersion>1.1.1.0</ApplicationVersion>
     2.9      <UseApplicationTrust>false</UseApplicationTrust>
    2.10      <CreateDesktopShortcut>true</CreateDesktopShortcut>
    2.11      <PublishWizardCompleted>true</PublishWizardCompleted>
    2.12 @@ -112,7 +112,7 @@
    2.13        <Private>True</Private>
    2.14      </Reference>
    2.15      <Reference Include="HarmonyHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
    2.16 -      <HintPath>..\packages\SharpLibHarmony.0.6.2\lib\net451\HarmonyHub.dll</HintPath>
    2.17 +      <HintPath>..\packages\SharpLibHarmony.0.6.3\lib\net451\HarmonyHub.dll</HintPath>
    2.18        <Private>True</Private>
    2.19      </Reference>
    2.20      <Reference Include="LibCecSharp, Version=2.2.0.0, Culture=neutral, processorArchitecture=x86">
     3.1 --- a/Server/packages.config	Tue Aug 30 03:45:45 2016 +0200
     3.2 +++ b/Server/packages.config	Tue Aug 30 11:04:40 2016 +0200
     3.3 @@ -4,7 +4,7 @@
     3.4    <package id="Loamen.agsXMPP" version="1.3.1" targetFramework="net46" />
     3.5    <package id="NAudio" version="1.7.3" targetFramework="net45" />
     3.6    <package id="SharpLibDisplay" version="0.2.5" targetFramework="net46" />
     3.7 -  <package id="SharpLibHarmony" version="0.6.2" targetFramework="net46" />
     3.8 +  <package id="SharpLibHarmony" version="0.6.3" targetFramework="net46" />
     3.9    <package id="SharpLibHid" version="1.4.2" targetFramework="net46" />
    3.10    <package id="SharpLibNotification" version="0.0.1" targetFramework="net46" />
    3.11    <package id="SharpLibWin32" version="0.0.9" targetFramework="net46" />