Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

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);
 								}

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)