From c8e66a2b45f52c72ef35b0472a68ff5cd1374092 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Wed, 8 Mar 2017 14:50:37 -0800 Subject: Don't crash when attempting to join a network while the zerotier service isn't running --- windows/WinUI/APIHandler.cs | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/windows/WinUI/APIHandler.cs b/windows/WinUI/APIHandler.cs index a762fff7..81c5b775 100644 --- a/windows/WinUI/APIHandler.cs +++ b/windows/WinUI/APIHandler.cs @@ -230,16 +230,23 @@ namespace WinUI request.Method = "POST"; request.ContentType = "applicaiton/json"; request.Timeout = 10000; - - using (var streamWriter = new StreamWriter(((HttpWebRequest)request).GetRequestStream())) - { - string json = "{\"allowManaged\":" + (allowManaged ? "true" : "false") + "," + - "\"allowGlobal\":" + (allowGlobal ? "true" : "false") + "," + - "\"allowDefault\":" + (allowDefault ? "true" : "false") + "}"; - streamWriter.Write(json); - streamWriter.Flush(); - streamWriter.Close(); - } + try + { + using (var streamWriter = new StreamWriter(((HttpWebRequest)request).GetRequestStream())) + { + string json = "{\"allowManaged\":" + (allowManaged ? "true" : "false") + "," + + "\"allowGlobal\":" + (allowGlobal ? "true" : "false") + "," + + "\"allowDefault\":" + (allowDefault ? "true" : "false") + "}"; + streamWriter.Write(json); + streamWriter.Flush(); + streamWriter.Close(); + } + } + catch (System.Net.WebException) + { + MessageBox.Show("Error Joining Network: Cannot connect to ZeroTier service."); + return; + } try { -- cgit v1.2.3