Revision 84a3db1b
b/trunk/NetSparkle/NetSparkleDownloadProgress.cs | ||
---|---|---|
164 | 164 |
switch (extension) |
165 | 165 |
{ |
166 | 166 |
case ".exe": |
167 |
installerCMD = _tempName;
|
|
167 |
installerCMD = String.Format("\"{0}\" /silent /norestart", _tempName);
|
|
168 | 168 |
break; |
169 | 169 |
case ".msi": |
170 | 170 |
installerCMD = String.Format("msiexec /i \"{0}\"", _tempName); |
b/trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs | ||
---|---|---|
243 | 243 |
return; |
244 | 244 |
//The server will return credentials for a different account, not just the current account |
245 | 245 |
//We need to find the correct account first |
246 |
var account = Accounts.First(act => act.AccountName == credentials.UserName); |
|
246 |
var account = Accounts.First(act => act.AccountName == credentials.UserName && act.ServerUrl == ?? );
|
|
247 | 247 |
account.ApiKey = credentials.Password; |
248 | 248 |
account.IsExpired = false; |
249 | 249 |
Settings.Save(); |
... | ... | |
379 | 379 |
actualRootPath = String.Format("{0} {1}", initialRootPath, attempt++); |
380 | 380 |
} |
381 | 381 |
} |
382 |
### Check that the account does not already exist |
|
382 | 383 |
|
383 | 384 |
var newAccount = new AccountSettings |
384 | 385 |
{ |
Also available in: Unified diff