Several bug fixes.

1 files changed, 2 insertions, 5 deletions

diff --git a/Software/Visual_Studio/Tango.WebRTC/WebRtcClient.cs b/Software/Visual_Studio/Tango.WebRTC/WebRtcClient.cs
index cb4cf174a..19f82b063 100644
--- a/Software/Visual_Studio/Tango.WebRTC/WebRtcClient.cs
+++ b/Software/Visual_Studio/Tango.WebRTC/WebRtcClient.cs
@@ -181,6 +181,7 @@ namespace Tango.WebRTC
                     if (!_conductor.InitializePeerConnection())
                     {
                         completion.SetException(new ApplicationException("Error initializing peer connection."));
+                        return;
                     }
 
                     _conductor.CreateDataChannel(DataChannelName);
@@ -201,21 +202,17 @@ namespace Tango.WebRTC
                 catch (Exception ex)
                 {
                     completion.SetException(ex);
+                    return;
                 }
 
                 IsInitialized = true;
 
                 completion.SetResult(true);
 
-                //Stopwatch watch = new Stopwatch();
-                //watch.Start();
-
                 while (!_isDisposed)
                 {
-                    //watch.Restart();
                     _conductor.ProcessMessages(1000);
                     Thread.Sleep(10);
-                    //Thread.Sleep(Math.Max(10, (int)watch.ElapsedMilliseconds));
                 }
 
                 IsInitialized = false;