From 9681de88719c5df40bcb15d1bb2863d554a8f7de Mon Sep 17 00:00:00 2001
From: Jared Goodwin <translucency@outlook.com>
Date: Mon, 27 Jan 2020 07:16:39 -0800
Subject: [PATCH] Remove viewer on command execute, in case the connection was
 already dropped on the other end.

---
 Desktop.Win/ViewModels/MainWindowViewModel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Desktop.Win/ViewModels/MainWindowViewModel.cs b/Desktop.Win/ViewModels/MainWindowViewModel.cs
index 16dc1cec..7c91caee 100644
--- a/Desktop.Win/ViewModels/MainWindowViewModel.cs
+++ b/Desktop.Win/ViewModels/MainWindowViewModel.cs
@@ -80,9 +80,10 @@ namespace Remotely.Desktop.Win.ViewModels
             {
                 return new Executor(async (param) =>
                 {
-                    foreach (Viewer viewer in (param as IList<object>))
+                    foreach (Viewer viewer in (param as IList<object>).ToArray())
                     {
                         viewer.DisconnectRequested = true;
+                        ViewerRemoved(this, viewer.ViewerConnectionID);
                         await Conductor.CasterSocket.SendViewerRemoved(viewer.ViewerConnectionID);
                     }
                 },