Fix saving preferences with no Sieve requirements

Fixes #2746
pull/37/merge
Francis Lachapelle 2014-05-01 14:07:25 -04:00
parent 4e42a6a689
commit 0b9afec635
2 changed files with 30 additions and 29 deletions

3
NEWS
View File

@ -2,9 +2,10 @@
------------------
Enhancements
- now able to emails to address book on send (#1496)
- now able to save unknown recipient emails to address book on send (#1496)
- Sieve folder encoding is now configurable (#2622)
- SOGo version is now displayed in preferences window (#2612)
- report Sieve error when saving preferences (#1046)
- added the SOGoMaximumSyncWindowSize system default to overwrite the
maximum number of items returned during an ActiveSync sync operation
- updated datepicker

View File

@ -1256,7 +1256,7 @@ static NSArray *reminderValues = nil;
if ([dd forwardEnabled])
[userDefaults setForwardOptions: forwardOptions];
if ([self isSieveServerAvailable])
if (!([dd sieveScriptsEnabled] || [dd vacationEnabled] || [dd forwardEnabled]) || [self isSieveServerAvailable])
{
[userDefaults synchronize];
folder = [[self clientObject] mailAccountsFolder: @"Mail"