1.1 --- a/Server/FormMain.cs	Thu Aug 25 13:12:54 2016 +0200
     1.2 +++ b/Server/FormMain.cs	Thu Aug 25 13:34:05 2016 +0200
     1.3 @@ -230,7 +230,7 @@
     1.4              ResetCec();
     1.5  
     1.6              //Harmony
     1.7 -            ResetHarmony();
     1.8 +            ResetHarmonyAsync();
     1.9  
    1.10              //Setup Events
    1.11              PopulateEventsTreeView();
    1.12 @@ -2549,13 +2549,14 @@
    1.13          /// <summary>
    1.14          /// 
    1.15          /// </summary>
    1.16 -        private async void ResetHarmony(bool aForceAuth=false)
    1.17 +        private async void ResetHarmonyAsync(bool aForceAuth=false)
    1.18          {
    1.19              // ConnectAsync already if we have an existing session cookie
    1.20              if (Properties.Settings.Default.HarmonyEnabled)
    1.21              {
    1.22                  try
    1.23                  {
    1.24 +                    iButtonHarmonyConnect.Enabled = false;
    1.25                      await ConnectHarmonyAsync(aForceAuth);
    1.26                  }
    1.27                  catch (Exception ex)
    1.28 @@ -2563,6 +2564,10 @@
    1.29                      Trace.WriteLine("Exception thrown by ConnectHarmonyAsync");
    1.30                      Trace.WriteLine(ex.ToString());
    1.31                  }
    1.32 +                finally
    1.33 +                {
    1.34 +                    iButtonHarmonyConnect.Enabled = true;
    1.35 +                }
    1.36              }
    1.37          }
    1.38  
    1.39 @@ -2575,7 +2580,7 @@
    1.40          {
    1.41              // User is explicitaly trying to connect
    1.42              //Reset Harmony Hub connection forcing authentication
    1.43 -            ResetHarmony(true);
    1.44 +            ResetHarmonyAsync(true);
    1.45          }
    1.46  
    1.47          /// <summary>
    1.48 @@ -2998,7 +3003,7 @@
    1.49              {
    1.50                  var sessionToken = File.ReadAllText("SessionToken");
    1.51                  Trace.WriteLine("Harmony: Reusing token: {0}", sessionToken);
    1.52 -                Program.HarmonyClient.OpenAsync(sessionToken);
    1.53 +                await Program.HarmonyClient.OpenAsync(sessionToken);
    1.54              }
    1.55              else
    1.56              {