Winify – Diff between revs 5 and 6

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 5 Rev 6
Line 7... Line 7...
7 using System.Windows.Forms; 7 using System.Windows.Forms;
8 using AutoUpdaterDotNET; 8 using AutoUpdaterDotNET;
9 using Winify.Connections; 9 using Winify.Connections;
10 using Winify.Gotify; 10 using Winify.Gotify;
11 using Winify.Properties; 11 using Winify.Properties;
-   12 using Winify.Serialization;
Line 12... Line 13...
12   13  
13 namespace Winify 14 namespace Winify
14 { 15 {
15 public partial class Form1 : Form 16 public partial class Form1 : Form
Line 18... Line 19...
18   19  
Line 19... Line 20...
19 private readonly GotifyConnectionManager _gotifyConnectionManager; 20 private readonly GotifyConnectionManager _gotifyConnectionManager;
Line 20... Line 21...
20   21  
Line 21... Line 22...
21 private AboutForm _aboutForm; 22 private AboutForm _aboutForm;
Line 22... Line 23...
22   23  
Line 118... Line 119...
118 { 119 {
119 if (_settingsForm == null) 120 if (_settingsForm == null)
120 { 121 {
121 return; 122 return;
122 } 123 }
-   124  
123 _settingsForm.Closing -= SettingsForm_Closing; 125 _settingsForm.Closing -= SettingsForm_Closing;
124 _settingsForm.ServersUpdated -= SettingsForm_ServersUpdated; 126 _settingsForm.ServersUpdated -= SettingsForm_ServersUpdated;
125 _settingsForm.Dispose(); 127 _settingsForm.Dispose();
126 _settingsForm = null; 128 _settingsForm = null;
127 } 129 }
Line 157... Line 159...
157   159  
Line 158... Line 160...
158 #endregion 160 #endregion
Line 159... Line 161...
159   161  
160 #region Private Methods 162 #region Private Methods
161   163  
162 private static async Task<Servers> LoadServers() 164 private static async Task<Servers.Servers> LoadServers()
163 { 165 {
164 if (!Directory.Exists(Constants.UserApplicationDirectory)) 166 if (!Directory.Exists(Constants.UserApplicationDirectory))
Line 172... Line 174...
172 { 174 {
173 case SerializationSuccess serializationSuccess: 175 case SerializationSuccess serializationSuccess:
174 return serializationSuccess.Servers; 176 return serializationSuccess.Servers;
Line 175... Line 177...
175   177  
176 default: 178 default:
177 return new Servers(); 179 return new Servers.Servers();
178 } 180 }
Line 179... Line 181...
179 } 181 }
180   182