github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not abort application shutdown when we need to save documents"

Browse Source 
This reverts commit 73f82c6c5c.

Conflicts:
	Frameworks/DocumentWindow/src/DocumentController.mm
This commit is contained in:
Allan Odgaard
2014-04-28 23:33:00 +07:00
parent 7fb02603b5
commit 978ec97ecf
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Frameworks/DocumentWindow/src/DocumentController.mm
View File

@@ -39,6 +39,7 @@ static NSString* const kUserDefaultsFindInSelectionByDefault = @"findInSelection
static NSString* const kUserDefaultsDisableFolderStateRestore = @"disableFolderStateRestore";
static NSString* const kUserDefaultsHideStatusBarKey = @"hideStatusBar";
static NSString* const OakDocumentPboardType = @"OakDocumentPboardType"; // drag’n’drop of tabs
static BOOL IsInShouldTerminateEventLoop = NO;
@interface QuickLookNSURLWrapper : NSObject <QLPreviewItem>
@property (nonatomic) NSURL* url;
@@ -461,6 +462,9 @@ namespace
{
case NSAlertFirstButtonReturn: /* "Save" */
{
if(std::exchange(IsInShouldTerminateEventLoop, NO))
[NSApp replyToApplicationShouldTerminate:NO];
[DocumentSaveHelper trySaveDocuments:documentsToSave forWindow:self.window defaultDirectory:self.untitledSavePath completionHandler:^(BOOL success){
callback(success);
}];
@@ -692,11 +696,17 @@ namespace
return NSTerminateNow;
}
IsInShouldTerminateEventLoop = YES;
DocumentController* controller = [SortedControllers() firstObject];
[controller showCloseWarningUIForDocuments:documents completionHandler:^(BOOL canClose){
if(canClose)
[self saveSessionAndDetachBackups];
[NSApp replyToApplicationShouldTerminate:canClose];
if(std::exchange(IsInShouldTerminateEventLoop, NO))
[NSApp replyToApplicationShouldTerminate:canClose];
else if(canClose)
[NSApp terminate:self];
}];
return NSTerminateLater;