Skip to content

Commit

Permalink
Bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
ALAN authored and ALAN committed Dec 9, 2016
1 parent 8ff81f7 commit 0a8cce1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
3 changes: 3 additions & 0 deletions AdvancedConnectPlugin/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
1.0.2
Bugfix

1.0.1
Added environment variables resolving

Expand Down
6 changes: 4 additions & 2 deletions AdvancedConnectPlugin/Data/CustomConnectionItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,15 @@ namespace AdvancedConnectPlugin.Data
public class CustomConnectionItem : ConnectionItem
{
private ApplicationItem application = null;
private String customConnectionOptions = String.Empty;

public CustomConnectionItem(AdvancedConnectPluginExt plugin, ApplicationItem application, PwEntry keepassEntry)
{
this.plugin = plugin;
this.keepassDatabase = this.plugin.keepassHost.Database;
this.application = application;
this.keepassEntry = keepassEntry;
this.customConnectionOptions = this.application.options;
}

public Boolean startConnection(out String errorMessage)
Expand All @@ -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
Expand All @@ -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();


Expand Down
4 changes: 2 additions & 2 deletions AdvancedConnectPlugin/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]

0 comments on commit 0a8cce1

Please sign in to comment.