Merge pull request getlantern#2890 from getlantern/issue2802

Fixed registry from installer and windows and auto-start by default closes #2802
pialin · Aug 7, 2015 · b60c229 · b60c229
2 parents ccc92ce + 52cd701
commit b60c229
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/installer-resources/windows/lantern.nsi b/installer-resources/windows/lantern.nsi
@@ -82,7 +82,7 @@ Section
     CreateShortCut "$DESKTOP\Lantern.lnk" "$INSTDIR\lantern.exe" "" "$INSTDIR\lantern.ico" 0
 
     # This is a bad registry entry created by old Lantern versions.
-    DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Run\value"
+    DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "value"
 
     # Add a registry key to set -clear-proxy-settings. See https://github.com/getlantern/lantern/issues/2776
     WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" \
@@ -135,7 +135,7 @@ Section "uninstall"
     DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\Lantern"
 
     # Don't run Lantern on startup.
-    DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Run\Lantern"
+    DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "Lantern"
 
     ${nsProcess::Unload}
 SectionEnd

diff --git a/src/github.com/getlantern/flashlight/config/config.go b/src/github.com/getlantern/flashlight/config/config.go
@@ -18,6 +18,7 @@ import (
 	"github.com/getlantern/appdir"
 	"github.com/getlantern/fronted"
 	"github.com/getlantern/golog"
+	"github.com/getlantern/launcher"
 	"github.com/getlantern/proxiedsites"
 	"github.com/getlantern/yaml"
 	"github.com/getlantern/yamlconf"
@@ -298,7 +299,8 @@ func (cfg *Config) applyClientDefaults() {
 
 	if cfg.AutoLaunch == nil {
 		cfg.AutoLaunch = new(bool)
-		*cfg.AutoLaunch = false
+		*cfg.AutoLaunch = true
+		launcher.CreateLaunchFile(*cfg.AutoLaunch)
 	}
 
 	// Make sure all servers have a QOS and Weight configured