nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2026-01-30 18:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed property more appropriatly

Browse Source
This commit is contained in:
michael starke
2017-05-19 17:22:27 +02:00
parent 1e719f6610
commit 3b8e0a7ae2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MacPass/MPDocument.m
View File

@@ -79,7 +79,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
@property (strong) IBOutlet NSView *warningView; @property (strong) IBOutlet NSView *warningView;
@property (weak) IBOutlet NSImageView *warningViewImage; @property (weak) IBOutlet NSImageView *warningViewImage;
@property (assign) BOOL fileChangeDialogOpen; @property (assign) BOOL lockedForFileChange;
@end @end
@@ -121,7 +121,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
if(self) { if(self) {
_didLockFile = NO; _didLockFile = NO;
_readOnly = NO; _readOnly = NO;
_fileChangeDialogOpen = NO; _lockedForFileChange = NO;
} }
return self; return self;
} }
@@ -276,11 +276,12 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
return; // Just metadata has changed return; // Just metadata has changed
} }
if(self.fileChangeDialogOpen) { if(self.lockedForFileChange) {
return; // We are already displaying an alert return; // We are already displaying an alert
} }
/* Set the flag in this call! */ /* Set the flag in this call! */
self.fileChangeDialogOpen = YES; self.lockedForFileChange = YES;
/* Dispatch the alert to the main queue */ /* Dispatch the alert to the main queue */
__weak MPDocument *welf = self; __weak MPDocument *welf = self;
@@ -295,7 +296,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
[alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE", @"Ignore the changes to an open file!")]; [alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE", @"Ignore the changes to an open file!")];
[alert beginSheetModalForWindow:welf.windowForSheet completionHandler:^(NSModalResponse returnCode) { [alert beginSheetModalForWindow:welf.windowForSheet completionHandler:^(NSModalResponse returnCode) {
welf.fileChangeDialogOpen = NO; welf.lockedForFileChange = NO;
switch(returnCode) { switch(returnCode) {
case NSAlertFirstButtonReturn: { case NSAlertFirstButtonReturn: {