Browse Source

Fixed falling out of the network monitor thread if the ZeroTier service isn't running on Windows

pull/1/head
Grant Limberg 9 years ago
parent
commit
8c30b2b9f5
  1. 15
      windows/WinUI/APIHandler.cs
  2. 5
      windows/WinUI/NetworkMonitor.cs

15
windows/WinUI/APIHandler.cs

@ -188,7 +188,8 @@ namespace WinUI
} }
catch (System.Net.WebException e) catch (System.Net.WebException e)
{ {
if (((HttpWebResponse)e.Response).StatusCode == HttpStatusCode.Unauthorized) HttpWebResponse res = (HttpWebResponse)e.Response;
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
{ {
APIHandler.initHandler(true); APIHandler.initHandler(true);
} }
@ -251,7 +252,8 @@ namespace WinUI
} }
catch (System.Net.WebException e) catch (System.Net.WebException e)
{ {
if (((HttpWebResponse)e.Response).StatusCode == HttpStatusCode.Unauthorized) HttpWebResponse res = (HttpWebResponse)e.Response;
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
{ {
APIHandler.initHandler(true); APIHandler.initHandler(true);
} }
@ -310,7 +312,8 @@ namespace WinUI
} }
catch (System.Net.WebException e) catch (System.Net.WebException e)
{ {
if (((HttpWebResponse)e.Response).StatusCode == HttpStatusCode.Unauthorized) HttpWebResponse res = (HttpWebResponse)e.Response;
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
{ {
APIHandler.initHandler(true); APIHandler.initHandler(true);
} }
@ -348,7 +351,8 @@ namespace WinUI
} }
catch (System.Net.WebException e) catch (System.Net.WebException e)
{ {
if (((HttpWebResponse)e.Response).StatusCode == HttpStatusCode.Unauthorized) HttpWebResponse res = (HttpWebResponse)e.Response;
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
{ {
APIHandler.initHandler(true); APIHandler.initHandler(true);
} }
@ -405,7 +409,8 @@ namespace WinUI
} }
catch (System.Net.WebException e) catch (System.Net.WebException e)
{ {
if (((HttpWebResponse)e.Response).StatusCode == HttpStatusCode.Unauthorized) HttpWebResponse res = (HttpWebResponse)e.Response;
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
{ {
APIHandler.initHandler(true); APIHandler.initHandler(true);
} }

5
windows/WinUI/NetworkMonitor.cs

@ -152,10 +152,11 @@ namespace WinUI
Thread.Sleep(2000); Thread.Sleep(2000);
} }
} }
catch catch (Exception e)
{ {
Console.WriteLine("Monitor Thread Ended"); Console.WriteLine("Monitor Thread Exception: " + "\n" + e.StackTrace);
} }
Console.WriteLine("Monitor Thread Ended");
} }
public void SubscribeStatusUpdates(StatusCallback cb) public void SubscribeStatusUpdates(StatusCallback cb)

Loading…
Cancel
Save