Winify – Diff between revs 9 and 11

Subversion Repositories:

?pathlinks?

Rev 9 – Details – Blame – Last modification – View Log

         private AboutForm _aboutForm;
+        private GotifyConnectionManager _gotifyConnectionManager;
-        private GotifyConnectionManager _gotifyConnectionManager;
+        private NotificationManager _notificationManager;
             Settings.Default.PropertyChanged += Default_PropertyChanged;
             _servers = new global::Servers.Servers();
+            _servers.Server.CollectionChanged += Server_CollectionChanged;
-            _servers.Server.CollectionChanged += Server_CollectionChanged;
+            _notificationManager = new NotificationManager(TaskScheduler.FromCurrentSynchronizationContext());
             _gotifyConnectionManager = new GotifyConnectionManager(_servers);
-            _gotifyConnectionManager = new GotifyConnectionManager(_servers);
+            _gotifyConnectionManager.GotifyNotification += GotifyConnectionManager_GotifyNotification;
                 Settings.Default.SettingsLoaded -= Default_SettingsLoaded;
                 Settings.Default.SettingsSaving -= Default_SettingsSaving;
+                Settings.Default.PropertyChanged -= Default_PropertyChanged;
                 Settings.Default.PropertyChanged -= Default_PropertyChanged;
                 _gotifyConnectionManager.GotifyNotification -= GotifyConnectionManager_GotifyNotification;
+                _gotifyConnectionManager?.Dispose();
+                _gotifyConnectionManager = null;
-                _gotifyConnectionManager?.Dispose();
+                _notificationManager?.Dispose();
-                _gotifyConnectionManager = null;
+                _notificationManager = null;
                 components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+        #endregion
-            base.Dispose(disposing);
+        #region Event Handlers
         private void GotifyConnectionManager_GotifyNotification(object sender, GotifyNotificationEventArgs e)
         #endregion
             _notificationManager.ShowNotification(e);