From 8c30b2b9f5d5c744c176de8b7cd803cb083db1f1 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 8 May 2017 13:27:54 -0700 Subject: Fixed falling out of the network monitor thread if the ZeroTier service isn't running on Windows --- windows/WinUI/APIHandler.cs | 15 ++++++++++----- windows/WinUI/NetworkMonitor.cs | 5 +++-- 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'windows') diff --git a/windows/WinUI/APIHandler.cs b/windows/WinUI/APIHandler.cs index 419a11cd..1b1ca1d7 100644 --- a/windows/WinUI/APIHandler.cs +++ b/windows/WinUI/APIHandler.cs @@ -188,7 +188,8 @@ namespace WinUI } 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); } @@ -251,7 +252,8 @@ namespace WinUI } 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); } @@ -310,7 +312,8 @@ namespace WinUI } 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); } @@ -348,7 +351,8 @@ namespace WinUI } 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); } @@ -405,7 +409,8 @@ namespace WinUI } 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); } diff --git a/windows/WinUI/NetworkMonitor.cs b/windows/WinUI/NetworkMonitor.cs index c276079d..ce722e45 100644 --- a/windows/WinUI/NetworkMonitor.cs +++ b/windows/WinUI/NetworkMonitor.cs @@ -152,10 +152,11 @@ namespace WinUI 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) -- cgit v1.2.3