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

Selecting “Save” during quit would lose untitled documents

Browse Source
This commit is contained in:
Allan Odgaard
2014-04-08 16:27:54 +07:00
parent 73f82c6c5c
commit 38b91da708
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -657,6 +657,21 @@ namespace
[self.window makeFirstResponder:oldFirstResponder];
}
+ (void)saveSessionAndDetachBackups
{
BOOL restoresSession = ![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableSessionRestoreKey];
[DocumentController saveSessionIncludingUntitledDocuments:restoresSession];
if(restoresSession)
{
// Ensure we do not remove backup files, as they are used to restore untitled documents
for(DocumentController* controller in [SortedControllers() reverseObjectEnumerator])
{
for(auto document : controller.documents)
document->detach_backup();
}
}
}
+ (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication*)sender
{
BOOL restoresSession = ![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableSessionRestoreKey];
@@ -666,23 +681,14 @@ namespace
if(documents.empty())
{
[DocumentController saveSessionIncludingUntitledDocuments:restoresSession];
if(restoresSession)
{
// Ensure we do not remove backup files, as they are used to restore untitled documents
for(DocumentController* controller in [SortedControllers() reverseObjectEnumerator])
{
for(auto document : controller.documents)
document->detach_backup();
}
}
[self saveSessionAndDetachBackups];
return NSTerminateNow;
}
DocumentController* controller = [SortedControllers() firstObject];
[controller showCloseWarningUIForDocuments:documents completionHandler:^(BOOL canClose){
if(canClose)
[DocumentController saveSessionIncludingUntitledDocuments:NO];
[self saveSessionAndDetachBackups];
[NSApp replyToApplicationShouldTerminate:canClose];
}];