From f0fc823b061c3fcc1775c7e74b1c2b76a4a1a67c Mon Sep 17 00:00:00 2001
From: Nathan Landis <nathanlandis@gmail.com>
Date: Sat, 21 May 2016 18:49:30 -0500
Subject: [PATCH] Fixed #464 stop multiple file-changed boxes from appearing at
 once

---
 .DS_Store              | Bin 0 -> 6148 bytes
 MacPass/MPDocument.m   |  16 +++++++++++++++-
 MacPassTests/.DS_Store | Bin 0 -> 6148 bytes
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .DS_Store
 create mode 100644 MacPassTests/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..dc9217d41d435d481007567afb366016d6ef51d6
GIT binary patch
literal 6148
zcmeHKOG*SW5Up}%F(AUYbD5<pVQvtHb}0yR0f%Wnh)o)Gz-6Dot9b-3;;WCJ#w-RG
zB2v|)UL~o@=RqeaBI4z?T@cNQXoe!lVpK$$t6h8UJO#3jv8D%nC-g*{%0PdyN!ETy
zXSBwO&!IopU#O)^>gk>e-QHa<R-4lGx`oN{>uyn9X_|KX2rgc(o)0v3hq=1a{vfKq
z`MScalZ6Tff`MQl7zhR`4B*Zdne7{f4hDjOVBmuRIUf>=V0Ih~_2_`o6aXmCXcgF!
zOGr#|%#MR0dLV3}KnrD0G1$V<p4=}x4u%#^?8yiF%<sty>+BdmsXK8t3>^#v17ijz
zR-McJe~MqGn&gi|q81DU1OJQxo;IsyiB0+4`fYo1*Cvz;6cO<o#DKsaJpxdXbL2=n
ctv`tkzw9^|$|%yV;lOwZC?TPOfnQ+Y4Xk!J)&Kwi

literal 0
HcmV?d00001

diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 73977dfc..adbaaed4 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -75,6 +75,8 @@ NSString *const MPDocumentGroupKey                        = @"MPDocumentGroupKey
 @property (strong) IBOutlet NSView *warningView;
 @property (weak) IBOutlet NSImageView *warningViewImage;
 
+@property (assign) BOOL fileChangeDialogOpen;;
+
 @end
 
 @implementation MPDocument
@@ -115,6 +117,7 @@ NSString *const MPDocumentGroupKey                        = @"MPDocumentGroupKey
   if(self) {
     _didLockFile = NO;
     _readOnly = NO;
+    _fileChangeDialogOpen = NO;
   }
   return self;
 }
@@ -244,15 +247,26 @@ NSString *const MPDocumentGroupKey                        = @"MPDocumentGroupKey
   if(NSOrderedSame == [self.fileModificationDate compare:modificationDate]) {
     return; // Just metadata has changed
   }
+  
+  if(_fileChangeDialogOpen) {
+    return; // This alert is already being shown
+  }
+  
   /* Dispatch the alert to the main queue */
   dispatch_async(dispatch_get_main_queue(), ^{
+    
+    _fileChangeDialogOpen = YES;
+    
     NSAlert *alert = [[NSAlert alloc] init];
     alert.alertStyle = NSWarningAlertStyle;
     alert.messageText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT", @"Message displayed when an open file was changed from another application");
-    alert.informativeText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_INFO_TEXT", @"Informative text displayed when the file was change form another application");
+    alert.informativeText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_INFO_TEXT", @"Informative text displayed when the file was change from another application");
     [alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE", @"Ignore the changes to an open file!")];
     [alert addButtonWithTitle:NSLocalizedString(@"LOAD_CHANGES", @"Reopen the file!")];
     [alert beginSheetModalForWindow:self.windowForSheet completionHandler:^(NSModalResponse returnCode) {
+      
+      _fileChangeDialogOpen = NO;
+      
       if(returnCode == NSAlertSecondButtonReturn) {
         [self revertDocumentToSaved:nil];
       }
diff --git a/MacPassTests/.DS_Store b/MacPassTests/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0c5819d3b2c3228997d7fd0985e93e64f9fe44aa
GIT binary patch
literal 6148
zcmeHKJ8Hu~5S>X}IJi;ia<7mZEJ8kkF5noOG{J!=Nv+D~^3nX}gRzj)1k!{zF!Oe2
z=dI8yG#U}n_G|wv(ul|sZYU=UbF*{vnLT7ifpFZhlNTA}Aj5Y*tG=Hw?vr%jeZp_}
zAIG=%<7?b}pUNy1paN8Y3Qz$m@Cya3_rjK|Kt?J+1*pJP0sB4_xM58k1O3y1;3EKV
zfwUXeK1%?LC4e<?3`7Q|K?Md?bHvb~BVV$vCXRtY7tP^A^U0bMiu%)WfAMnB8pucm
zsK8W#$JjR3|2Oa-=Km>)J1Rg0{*?l{==!e3D`jt;y`1&h0^h=|<_tH(+9?R$j)C5e
hv9Wf%_M)gOw#Io)90Q$>ywidF88BUFRN$`_xB&M{6;J>G

literal 0
HcmV?d00001