From: Panagiotis Kanavos Date: Fri, 30 Mar 2012 14:54:44 +0000 (+0300) Subject: Temp fixes X-Git-Url: https://code.grnet.gr/git/pithos-ms-client/commitdiff_plain/84a3db1b645b989f2c512b66ab8097deb7316b5a Temp fixes --- diff --git a/trunk/NetSparkle/NetSparkleDownloadProgress.cs b/trunk/NetSparkle/NetSparkleDownloadProgress.cs index de012b0..324f533 100644 --- a/trunk/NetSparkle/NetSparkleDownloadProgress.cs +++ b/trunk/NetSparkle/NetSparkleDownloadProgress.cs @@ -164,7 +164,7 @@ namespace AppLimit.NetSparkle switch (extension) { case ".exe": - installerCMD = _tempName; + installerCMD = String.Format("\"{0}\" /silent /norestart", _tempName); break; case ".msi": installerCMD = String.Format("msiexec /i \"{0}\"", _tempName); diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs index a6a3790..2857dc8 100644 --- a/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs +++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs @@ -243,7 +243,7 @@ namespace Pithos.Client.WPF.Preferences return; //The server will return credentials for a different account, not just the current account //We need to find the correct account first - var account = Accounts.First(act => act.AccountName == credentials.UserName); + var account = Accounts.First(act => act.AccountName == credentials.UserName && act.ServerUrl == ?? ); account.ApiKey = credentials.Password; account.IsExpired = false; Settings.Save(); @@ -379,6 +379,7 @@ namespace Pithos.Client.WPF.Preferences actualRootPath = String.Format("{0} {1}", initialRootPath, attempt++); } } + ### Check that the account does not already exist var newAccount = new AccountSettings {