From ff55094651b2201237dcf1550392685e998258c6 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Sun, 19 Feb 2012 16:04:43 +0100 Subject: [PATCH] controller: always install protocol handler, not just on the first run --- SparkleShare/SparkleAboutController.cs | 2 +- SparkleShare/SparkleControllerBase.cs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/SparkleShare/SparkleAboutController.cs b/SparkleShare/SparkleAboutController.cs index 776552fd..fb9fa5ee 100755 --- a/SparkleShare/SparkleAboutController.cs +++ b/SparkleShare/SparkleAboutController.cs @@ -90,7 +90,7 @@ namespace SparkleShare { // Add a little delay, making it seems we're // actually doing hard work - Thread.Sleep (2 * 1000); + Thread.Sleep (1000); if (running_version >= new_version) { if (VersionUpToDateEvent != null) diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs index 37c5dcfc..b4224018 100755 --- a/SparkleShare/SparkleControllerBase.cs +++ b/SparkleShare/SparkleControllerBase.cs @@ -138,18 +138,16 @@ namespace SparkleShare { { InstallLauncher (); EnableSystemAutostart (); + InstallProtocolHandler (); // Create the SparkleShare folder and add it to the bookmarks if (CreateSparkleShareFolder ()) AddToBookmarks (); - if (FirstRun) { + if (FirstRun) SparkleConfig.DefaultConfig.SetConfigOption ("notifications", bool.TrueString); - InstallProtocolHandler (); - - } else { + else ImportPrivateKey (); - } // Watch the SparkleShare folder FileSystemWatcher watcher = new FileSystemWatcher (SparkleConfig.DefaultConfig.FoldersPath) {