Merge pull request xkjyeah#10 from selvanair/autostart-config-dir

Autostart config dir
selvanair · Nov 29, 2018 · b8aa93b · b8aa93b
2 parents 22e23e5 + f2cf5c2
commit b8aa93b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/OpenVpnService.csproj b/OpenVpnService.csproj
@@ -25,11 +25,11 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.3.0.%2a</ApplicationVersion>
+    <ApplicationVersion>1.4.0.%2a</ApplicationVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <ReleaseVersion>1.3.0.0</ReleaseVersion>
+    <ReleaseVersion>1.4.0.0</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>OpenVpn.OpenVpnService</StartupObject>

diff --git a/ProjectInstaller.Designer.cs b/ProjectInstaller.Designer.cs
diff --git a/Service.cs b/Service.cs
@@ -97,7 +97,7 @@ protected override void OnStart(string[] args)
                         var config = new OpenVpnServiceConfiguration()
                         {
                             exePath = (string)rkOvpn.GetValue("exe_path"),
-                            configDir = (string)rkOvpn.GetValue("config_dir"),
+                            configDir = (string)rkOvpn.GetValue("autostart_config_dir"),
                             configExt = "." + (string)rkOvpn.GetValue("config_ext"),
                             logDir = (string)rkOvpn.GetValue("log_dir"),
                             logAppend = append,
@@ -106,7 +106,7 @@ protected override void OnStart(string[] args)
                             eventLog = EventLog,
                         };
 
-                        if (configDirsConsidered.Contains(config.configDir)) {
+                        if (String.IsNullOrEmpty(config.configDir) || configDirsConsidered.Contains(config.configDir)) {
                             continue;
                         }
                         configDirsConsidered.Add(config.configDir);