Remote Desktop - Disconnect on tab close

Author: BornToBeRoot

Source/NETworkManager/Controls/DragablzRemoteDesktopTabItem.cs

@@ -0,0 +1,35 @@
+using System;
+
+namespace NETworkManager.Controls
+{
+    public class DragablzRemoteDesktopTabItem : IDisposable
+    {
+        public string Header { get; set; }
+        public RemoteDesktopControl Control { get; set; }
+
+        public DragablzRemoteDesktopTabItem(string header, RemoteDesktopControl control)
+        {
+            Header = header;
+            Control = control;
+        }
+
+        private bool _disposed;
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+                return;
+
+            if (disposing)
+                Control.OnClose();
+
+            _disposed = true;
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+    }
+}

Source/NETworkManager/Controls/DragablzTabContent.cs

@@ -10,6 +10,7 @@
 
 namespace NETworkManager.Controls
 {
+       
     public partial class RemoteDesktopControl : UserControl, INotifyPropertyChanged
     {
         #region PropertyChangedEventHandler
@@ -117,7 +118,7 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
         {
             if (!Connected)
                 Connect();
-        }
+        }     
         #endregion
 
         #region ICommands & Actions
@@ -168,7 +169,7 @@ private void Connect()
             // Events
             rdpClient.OnConnected += RdpClient_OnConnected;
             rdpClient.OnDisconnected += RdpClient_OnDisconnected;
-            
+
             rdpClient.Connect();
         }
 
@@ -185,6 +186,17 @@ private void Reconnect()
             rdpClient.Connect();
         }
 
+        private void Disconnect()
+        {
+            rdpClient.Disconnect();
+        }
+
+        public void OnClose()
+        {
+            if (Connected)
+                Disconnect();
+        }
+
         private void ReconnectAdjustScreen()
         {
             rdpClient.Reconnect((uint)rdpGrid.ActualWidth, (uint)rdpGrid.ActualHeight);
@@ -336,7 +348,7 @@ private void ReconnectAdjustScreenTimer_Tick(object sender, EventArgs e)
 
             // Reconnect with new resulution
             ReconnectAdjustScreen();
-        }
-        #endregion       
+        }               
+        #endregion
     }
 }

Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs

@@ -179,7 +179,7 @@
     <Compile Include="3rdParty\Heijden.DNS\RR.cs" />
     <Compile Include="3rdParty\Heijden.DNS\Structs.cs" />
     <Compile Include="Controls\DragablzMainInterTabClient.cs" />
-    <Compile Include="Controls\DragablzTabContent.cs" />
+    <Compile Include="Controls\DragablzRemoteDesktopTabItem.cs" />
     <Compile Include="Converters\NullOrEmptyToBoolConverter.cs" />
     <Compile Include="Converters\TimestampToStringConverter.cs" />
     <Compile Include="Converters\NullableDateTimeToStringConverter.cs" />

Source/NETworkManager/NETworkManager.csproj

@@ -11,6 +11,7 @@
 using System.Windows.Data;
 using System;
 using System.Linq;
+using System.Collections.Specialized;
 
 namespace NETworkManager.ViewModels.Applications
 {
@@ -20,7 +21,7 @@ public class RemoteDesktopViewModel : ViewModelBase
         private IDialogCoordinator dialogCoordinator;
 
         public IInterTabClient InterTabClient { get; private set; }
-        public ObservableCollection<DragablzTabContent> TabContents { get; private set; }
+        public ObservableCollection<DragablzRemoteDesktopTabItem> TabItems { get; private set; }
 
         private const string tagIdentifier = "tag=";
 
@@ -103,7 +104,9 @@ public RemoteDesktopViewModel(IDialogCoordinator instance)
             dialogCoordinator = instance;
 
             InterTabClient = new DragablzMainInterTabClient();
-            TabContents = new ObservableCollection<DragablzTabContent>();
+            TabItems = new ObservableCollection<DragablzRemoteDesktopTabItem>();
+
+            TabItems.CollectionChanged += TabItems_CollectionChanged;
 
             // Load sessions
             if (RemoteDesktopSessionManager.Sessions == null)
@@ -131,7 +134,7 @@ public RemoteDesktopViewModel(IDialogCoordinator instance)
                 else
                 {
                     return info.Name.IndexOf(search, StringComparison.OrdinalIgnoreCase) > -1;
-                }                
+                }
             };
 
             LoadSettings();
@@ -159,8 +162,8 @@ private void ConnectSession(Models.RemoteDesktop.RemoteDesktopSessionInfo sessio
             sessionInfo.RedirectPorts = SettingsManager.Current.RemoteDesktop_RedirectPorts;
             sessionInfo.RedirectSmartCards = SettingsManager.Current.RemoteDesktop_RedirectSmartCards;
 
-            TabContents.Add(new DragablzTabContent(Header ?? sessionInfo.Hostname, new RemoteDesktopControl(sessionInfo)));
-            SelectedTabIndex = TabContents.Count - 1;
+            TabItems.Add(new DragablzRemoteDesktopTabItem(Header ?? sessionInfo.Hostname, new RemoteDesktopControl(sessionInfo)));
+            SelectedTabIndex = TabItems.Count - 1;
         }
 
         private void RemoteDesktopSession_Search(object sender, FilterEventArgs e)
@@ -394,5 +397,16 @@ private async void DeleteSessionAction()
             await dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
         #endregion
+
+        #region Events
+        private void TabItems_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                DragablzRemoteDesktopTabItem item = (DragablzRemoteDesktopTabItem)e.OldItems[0];
+                item.Dispose();
+            }
+        }
+        #endregion
     }
 }

Source/NETworkManager/ViewModels/Applications/RemoteDesktopViewModel.cs

@@ -19,7 +19,7 @@
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <dragablz:TabablzControl Grid.Column="0" Grid.Row="0" Margin="-0,-2,0,0" ItemsSource="{Binding TabContents}" SelectedIndex="{Binding SelectedTabIndex}">
+        <dragablz:TabablzControl Grid.Column="0" Grid.Row="0" Margin="-0,-2,0,0" ItemsSource="{Binding TabItems}" SelectedIndex="{Binding SelectedTabIndex}">
             <dragablz:TabablzControl.InterTabController>
                 <dragablz:InterTabController InterTabClient="{Binding InterTabClient}" />
             </dragablz:TabablzControl.InterTabController>
@@ -51,7 +51,7 @@
                     <Setter Property="ContentTemplate">
                         <Setter.Value>
                             <DataTemplate>
-                                <ContentPresenter Content="{Binding Content}" Visibility="{Binding Source={x:Static ConfigurtationManager:ConfigurationManager.Current}, Path=FixAirspace, Converter={StaticResource BooleanReverseToVisibilityConverter}}" />
+                                <ContentPresenter Content="{Binding Control}" Visibility="{Binding Source={x:Static ConfigurtationManager:ConfigurationManager.Current}, Path=FixAirspace, Converter={StaticResource BooleanReverseToVisibilityConverter}}" />
                             </DataTemplate>
                         </Setter.Value>
                     </Setter>