pull/42/head
Ludovic Marcotte 2014-06-16 11:00:39 -04:00
parent 8202d0588f
commit 50c0b49a6f
2 changed files with 19 additions and 11 deletions

1
NEWS
View File

@ -13,6 +13,7 @@ Bug fixes
- fixed the reply/forward operation over ActiveSync (#2805)
- fixed regression when attaching files to a reply
- wait 20 seconds (instead of 2) before deleting temporary download forms (#2811)
- avoid raising exceptions when the db is down and we try to access the preferences module (#2813)
2.2.5 (2014-06-05)
------------------

View File

@ -328,6 +328,10 @@ static NSArray *childRecordFields = nil;
= [[GCSFolderManager defaultFolderManager] folderInfoLocation];
fc = [cm acquireOpenChannelForURL: folderLocation];
if (fc)
{
// We use an exception handler here in case the database is down when
// performing the query. This could have unexpected results.
NS_DURING
{
sql
= [NSString stringWithFormat: (@"SELECT c_foldername FROM %@"
@ -341,6 +345,9 @@ static NSArray *childRecordFields = nil;
[fc cancelFetch];
[cm releaseChannel: fc];
}
NS_HANDLER;
NS_ENDHANDLER;
}
}
- (void) _fetchDisplayNameFromSubscriber