From 2db6fabbe9e22cd7febb373aafec18a0cf37c7bb Mon Sep 17 00:00:00 2001
From: David Sparer <sparerd@gmail.com>
Date: Wed, 18 Jul 2018 14:52:12 -0500
Subject: [PATCH] reverted 3bdcf65

---
 mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs  | 8 ++------
 mRemoteV1/Tree/ConnectionTreeModel.cs                  | 8 --------
 mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs | 3 ---
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs b/mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs
index 6fa400563..4ff069e0f 100644
--- a/mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs
+++ b/mRemoteV1/Config/Connections/SaveConnectionsOnEdit.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using mRemoteNG.App;
 using mRemoteNG.Connection;
-using mRemoteNG.Messages;
 
 namespace mRemoteNG.Config.Connections
 {
@@ -22,10 +20,9 @@ namespace mRemoteNG.Config.Connections
 
         private void ConnectionsServiceOnConnectionsLoaded(object sender, ConnectionsLoadedEventArgs connectionsLoadedEventArgs)
         {
-            
-
             connectionsLoadedEventArgs.NewConnectionTreeModel.CollectionChanged += ConnectionTreeModelOnCollectionChanged;
             connectionsLoadedEventArgs.NewConnectionTreeModel.PropertyChanged += ConnectionTreeModelOnPropertyChanged;
+
             foreach (var oldTree in connectionsLoadedEventArgs.PreviousConnectionTreeModel)
             {
                 oldTree.CollectionChanged -= ConnectionTreeModelOnCollectionChanged;
@@ -47,9 +44,8 @@ namespace mRemoteNG.Config.Connections
         {
             if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit)
                 return;
-            _connectionsService.SaveConnections();
 
-            Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Auto saved connections");
+            _connectionsService.SaveConnectionsAsync();
         }
     }
 }
diff --git a/mRemoteV1/Tree/ConnectionTreeModel.cs b/mRemoteV1/Tree/ConnectionTreeModel.cs
index a336aff4d..502cf36ee 100644
--- a/mRemoteV1/Tree/ConnectionTreeModel.cs
+++ b/mRemoteV1/Tree/ConnectionTreeModel.cs
@@ -11,8 +11,6 @@ namespace mRemoteNG.Tree
     public sealed class ConnectionTreeModel : INotifyCollectionChanged, INotifyPropertyChanged
     {
         public List<ContainerInfo> RootNodes { get; } = new List<ContainerInfo>();
-        public bool SuspendingCollectionChangedEvents { get; set; }
-        public bool SuspendingPropertyChangedEvents { get; set; }
 
         public void AddRootNode(ContainerInfo rootNode)
         {
@@ -68,9 +66,6 @@ namespace mRemoteNG.Tree
         public event NotifyCollectionChangedEventHandler CollectionChanged;
         private void RaiseCollectionChangedEvent(object sender, NotifyCollectionChangedEventArgs args)
         {
-            if (SuspendingCollectionChangedEvents)
-                return;
-
             CollectionChanged?.Invoke(sender, args);
         }
 
@@ -78,9 +73,6 @@ namespace mRemoteNG.Tree
 
         private void RaisePropertyChangedEvent(object sender, PropertyChangedEventArgs args)
         {
-            if (SuspendingPropertyChangedEvents)
-                return;
-
             PropertyChanged?.Invoke(sender, args);
         }
     }
diff --git a/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs b/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
index df8711c28..e7ca75784 100644
--- a/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
+++ b/mRemoteV1/UI/Controls/ConnectionTree/ConnectionTree.cs
@@ -311,14 +311,11 @@ namespace mRemoteNG.UI.Controls
             if (sortTarget == null)
                 sortTarget = GetRootConnectionNode();
 
-            var wasSuspendingEvents = _connectionTreeModel.SuspendingCollectionChangedEvents;
-            _connectionTreeModel.SuspendingCollectionChangedEvents = true;
             var sortTargetAsContainer = sortTarget as ContainerInfo;
             if (sortTargetAsContainer != null)
                 sortTargetAsContainer.SortRecursive(sortDirection);
             else
                 SelectedNode.Parent.SortRecursive(sortDirection);
-            _connectionTreeModel.SuspendingCollectionChangedEvents = wasSuspendingEvents;
         }
 
         /// <summary>