From 0a8cce168e31b559ad6246e62b982100e63b3e73 Mon Sep 17 00:00:00 2001 From: ALAN Date: Fri, 9 Dec 2016 10:35:14 +0100 Subject: [PATCH] Bugfix --- AdvancedConnectPlugin/CHANGELOG.txt | 3 +++ AdvancedConnectPlugin/Data/CustomConnectionItem.cs | 6 ++++-- AdvancedConnectPlugin/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/AdvancedConnectPlugin/CHANGELOG.txt b/AdvancedConnectPlugin/CHANGELOG.txt index 9d972d9..f25180b 100644 --- a/AdvancedConnectPlugin/CHANGELOG.txt +++ b/AdvancedConnectPlugin/CHANGELOG.txt @@ -1,3 +1,6 @@ +1.0.2 +Bugfix + 1.0.1 Added environment variables resolving diff --git a/AdvancedConnectPlugin/Data/CustomConnectionItem.cs b/AdvancedConnectPlugin/Data/CustomConnectionItem.cs index 2e3e962..65eb5cd 100644 --- a/AdvancedConnectPlugin/Data/CustomConnectionItem.cs +++ b/AdvancedConnectPlugin/Data/CustomConnectionItem.cs @@ -21,6 +21,7 @@ namespace AdvancedConnectPlugin.Data public class CustomConnectionItem : ConnectionItem { private ApplicationItem application = null; + private String customConnectionOptions = String.Empty; public CustomConnectionItem(AdvancedConnectPluginExt plugin, ApplicationItem application, PwEntry keepassEntry) { @@ -28,6 +29,7 @@ public CustomConnectionItem(AdvancedConnectPluginExt plugin, ApplicationItem app this.keepassDatabase = this.plugin.keepassHost.Database; this.application = application; this.keepassEntry = keepassEntry; + this.customConnectionOptions = this.application.options; } public Boolean startConnection(out String errorMessage) @@ -40,7 +42,7 @@ public Boolean startConnection(out String errorMessage) //Overwrite application options if set in keepass entry if (this.keepassEntry.Strings.ReadSafe(this.plugin.settings.connectionOptionsField).Length > 0) { - this.application.options = this.keepassEntry.Strings.ReadSafe(this.plugin.settings.connectionOptionsField); + this.customConnectionOptions = this.keepassEntry.Strings.ReadSafe(this.plugin.settings.connectionOptionsField); } //Create a thread to allow non gui blocking sleeps @@ -49,7 +51,7 @@ public Boolean startConnection(out String errorMessage) Thread.CurrentThread.IsBackground = true; //Background threads will stop automatically on program close //Fill placeholders in options and start programm - StartProcess.Start(fillPlaceholders(this.application.path), fillPlaceholders(this.application.options)); + StartProcess.Start(fillPlaceholders(this.application.path), fillPlaceholders(this.customConnectionOptions)); }).Start(); diff --git a/AdvancedConnectPlugin/Properties/AssemblyInfo.cs b/AdvancedConnectPlugin/Properties/AssemblyInfo.cs index 22c1854..749a316 100644 --- a/AdvancedConnectPlugin/Properties/AssemblyInfo.cs +++ b/AdvancedConnectPlugin/Properties/AssemblyInfo.cs @@ -44,5 +44,5 @@ with the License. You may obtain a copy of the License at // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] +[assembly: AssemblyVersion("1.0.2.0")] +[assembly: AssemblyFileVersion("1.0.2.0")]