From 8f61224777179490a474a9d70f118f970523f631 Mon Sep 17 00:00:00 2001 From: Mark van Renswoude Date: Fri, 23 Aug 2019 11:18:19 +0200 Subject: [PATCH] Fixed "no data" message appearing immediately Fixed TaskCanceledException handling on shutdown --- CameraStream.cs | 3 +++ CameraView.cs | 9 ++++++--- config.json | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CameraStream.cs b/CameraStream.cs index 5da2b44..2da6a35 100644 --- a/CameraStream.cs +++ b/CameraStream.cs @@ -75,6 +75,9 @@ namespace IPCamAppBar await ReadFrames(responseStream, cancellationToken); } } + catch (TaskCanceledException) + { + } catch (Exception e) { if (cancellationToken.IsCancellationRequested) diff --git a/CameraView.cs b/CameraView.cs index f845250..24dcb0c 100644 --- a/CameraView.cs +++ b/CameraView.cs @@ -9,6 +9,7 @@ namespace IPCamAppBar public partial class CameraView : UserControl { private DateTime lastFrameTime; + private Timer noDataTimer; public CameraView(string url) @@ -19,10 +20,11 @@ namespace IPCamAppBar cameraStream.Frame += CameraStreamOnFrame; cameraStream.Start(url); - var noDataTimer = new Timer(); - noDataTimer.Interval = 1000; + noDataTimer = new Timer + { + Interval = 1000 + }; noDataTimer.Tick += CheckNoData; - noDataTimer.Start(); Disposed += (sender, args) => { @@ -46,6 +48,7 @@ namespace IPCamAppBar NoDataLabel.Visible = false; lastFrameTime = DateTime.Now; + noDataTimer.Start(); var viewImage = new Bitmap(Width, Height); using (var graphics = Graphics.FromImage(viewImage)) diff --git a/config.json b/config.json index 87d2c1f..3cd5752 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "AppBar": { - "Monitor": 1, + "Monitor": 0, "Side": "Top", "Size": 480 },