Merge branch 'issue_513_change_warning_dialog_hangs'

This commit is contained in:
michael starke
2016-11-17 11:13:23 +01:00

View File

@@ -265,7 +265,6 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
- (void)presentedItemDidChange { - (void)presentedItemDidChange {
[super presentedItemDidChange]; [super presentedItemDidChange];
/* If we are locked we have the data written back to file - just revert */ /* If we are locked we have the data written back to file - just revert */
if(self.encrypted) { if(self.encrypted) {
[self revertDocumentToSaved:nil]; [self revertDocumentToSaved:nil];
@@ -297,7 +296,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
self.fileChangeDialogOpen = NO; self.fileChangeDialogOpen = NO;
if(returnCode == NSAlertSecondButtonReturn) { if(returnCode == NSAlertSecondButtonReturn) {
[self revertDocumentToSaved:nil]; [self revertToContentsOfURL:self.fileURL ofType:self.fileType error:nil];
} }
}]; }];
}); });