From abf81625c436562acbb13f5c3ab4d0a427e25fee Mon Sep 17 00:00:00 2001 From: Anton Kasyanov Date: Wed, 5 Jul 2017 22:11:45 +0300 Subject: [PATCH 1/3] Application crashes if its configuration file is locked while it attempts to write down changed configuration --- Eve-O-Preview/Configuration/ConfigurationStorage.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Eve-O-Preview/Configuration/ConfigurationStorage.cs b/Eve-O-Preview/Configuration/ConfigurationStorage.cs index f6452db..e378dbf 100644 --- a/Eve-O-Preview/Configuration/ConfigurationStorage.cs +++ b/Eve-O-Preview/Configuration/ConfigurationStorage.cs @@ -1,4 +1,5 @@ -using System.IO; +using System; +using System.IO; using Newtonsoft.Json; namespace EveOPreview.Configuration @@ -36,8 +37,16 @@ namespace EveOPreview.Configuration public void Save() { string rawData = JsonConvert.SerializeObject(this._thumbnailConfig, Formatting.Indented); + string filename = this.GetConfigFileName(); - File.WriteAllText(this.GetConfigFileName(), rawData); + try + { + File.WriteAllText(filename, rawData); + } + catch (IOException) + { + // Ignore error if for some reason the updated config cannot be written down + } } private string GetConfigFileName() From 29d8e51c70958f1753cbdc58200a6b4757b41550 Mon Sep 17 00:00:00 2001 From: Anton Kasyanov Date: Fri, 30 Mar 2018 01:38:32 +0300 Subject: [PATCH 2/3] Merge fix --- Eve-O-Preview/Configuration/ConfigurationStorage.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Eve-O-Preview/Configuration/ConfigurationStorage.cs b/Eve-O-Preview/Configuration/ConfigurationStorage.cs index 1593c04..50a0663 100644 --- a/Eve-O-Preview/Configuration/ConfigurationStorage.cs +++ b/Eve-O-Preview/Configuration/ConfigurationStorage.cs @@ -1,5 +1,4 @@ -using System; -using System.IO; +using System.IO; using Newtonsoft.Json; namespace EveOPreview.Configuration @@ -36,12 +35,8 @@ namespace EveOPreview.Configuration public void Save() { -<<<<<<< HEAD - string rawData = JsonConvert.SerializeObject(this._thumbnailConfig, Formatting.Indented); - string filename = this.GetConfigFileName(); -======= string rawData = JsonConvert.SerializeObject(this._thumbnailConfiguration, Formatting.Indented); ->>>>>>> develop + string filename = this.GetConfigFileName(); try { From 348a420e3cd9372b14033856c82fd4094d81f198 Mon Sep 17 00:00:00 2001 From: Anton Kasyanov Date: Fri, 30 Mar 2018 01:40:41 +0300 Subject: [PATCH 3/3] README.md update --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 604c76a..84fbf39 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Overview -The purpose of this application is to provide a simple way to keep an eye on several simultaneously running EVE Online clients and to easily switch between them. While running it shows a set of live thumbnails for each of the active EVE Online clients. These thumbnails allow fast switch to the corresponding EVE Online client either using mouse or a configurable hotkey. +The purpose of this application is to provide a simple way to keep an eye on several simultaneously running EVE Online clients and to easily switch between them. While running it shows a set of live thumbnails for each of the active EVE Online clients. These thumbnails allow fast switch to the corresponding EVE Online client either using mouse or configurable hotkeys. -It's essentially a task switcher, it does not relay any keyboard/mouse events and suchlike. The app works with EVE, EVE through Steam, or any combination thereof. +It's essentially a task switcher, it does not relay any keyboard/mouse events and suchlike. The application works with EVE, EVE through Steam, or any combination thereof. The program does NOT (and will NOT ever) do the following things: @@ -17,7 +17,7 @@ If you have find out that some of the features or their combination of EVE-O Pre # System Requirements -* Windows Vista, Windows 7, Windows 8/8.1, Windows 10 +* Windows 7, Windows 8/8.1, Windows 10 * Microsoft .NET Framework 4.7+ * EVE clients Display Mode should be set to **Fixed Window** or **Window Mode**. **Fullscreen** mode is not supported.