Merge remote-tracking branch 'remotes/origin/MP1-4535-BUG-TvServer_cr…

…ashes_if_PingMonitor_is_enabled_and_pinged_host_is_not_reachable'
MediaPortal · Jul 24, 2014 · 29f9d3f · 29f9d3f
2 parents 6d741eb + 4985345
commit 29f9d3f
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PingStandbyHandler.cs b/TvEngine3/TVLibrary/Plugins/PowerScheduler/Handlers/PingStandbyHandler.cs
@@ -103,17 +103,21 @@ public StandbyMode StandbyMode
 
       private void PingCompletedCallback(object sender, PingCompletedEventArgs e)
       {
-        if (e.Cancelled)
+        try
         {
-          Log.Debug("PS: PingCompletedCallback, Ping canceled.");
-          return;
-        }
+          if (e.Cancelled)
+          {
+            Log.Debug("PS: PingCompletedCallback, Ping canceled.");
+            return;
+          }
 
-        if (e.Reply.Status == IPStatus.Success)
-        {
-          _isActiveHost = true;
-          Log.Debug("PS: PingMonitor found an active host {0}", e.Reply.Address);
+          if (e.Reply.Status == IPStatus.Success)
+          {
+            _isActiveHost = true;
+            Log.Debug("PS: PingMonitor found an active host {0}", e.Reply.Address);
+          }
         }
+        catch (Exception) { }
       }
 
       public void UserShutdownNow() { }