github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-01-20 20:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Save All with more than one document would crash

Browse Source
This commit is contained in:
Allan Odgaard
2013-01-10 18:40:31 +01:00
parent 80c358f947
commit 4a97f6e64d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -705,17 +705,19 @@ namespace
{
struct save_callback_t : document_save_callback_t
{
save_callback_t (DocumentController* self) : _self(self) { }
save_callback_t (DocumentController* self, size_t count) : _self(self), _count(count) { }
void did_save_document (document::document_ptr document, bool flag, std::string const& message, oak::uuid_t const& filter)
{
if(flag)
[_self documentDidChange:document];
delete this;
if(--_count == 0 || !flag)
delete this;
}
private:
__weak DocumentController* _self;
size_t _count;
};
}
@@ -723,7 +725,7 @@ namespace
{
if([self selectedDocument]->path() != NULL_STR)
{
[DocumentSaveHelper trySaveDocument:[self selectedDocument] forWindow:self.window defaultDirectory:nil andCallback:new save_callback_t(self)];
[DocumentSaveHelper trySaveDocument:[self selectedDocument] forWindow:self.window defaultDirectory:nil andCallback:new save_callback_t(self, 1)];
}
else
{
@@ -758,7 +760,7 @@ namespace
self.documents = newDocuments;
}
[DocumentSaveHelper trySaveDocument:self.selectedDocument forWindow:self.window defaultDirectory:nil andCallback:new save_callback_t(self)];
[DocumentSaveHelper trySaveDocument:self.selectedDocument forWindow:self.window defaultDirectory:nil andCallback:new save_callback_t(self, 1)];
[self updatePathDependentProperties];
}];
}
@@ -775,7 +777,7 @@ namespace
return;
[self selectedDocument]->set_path(to_s(path));
[self selectedDocument]->set_disk_encoding(encoding);
[DocumentSaveHelper trySaveDocument:self.selectedDocument forWindow:self.window defaultDirectory:nil andCallback:new save_callback_t(self)];
[DocumentSaveHelper trySaveDocument:self.selectedDocument forWindow:self.window defaultDirectory:nil andCallback:new save_callback_t(self, 1)];
[self updatePathDependentProperties];
}];
}
@@ -788,7 +790,7 @@ namespace
if((*document)->is_modified())
documentsToSave.push_back(*document);
}
[DocumentSaveHelper trySaveDocuments:documentsToSave forWindow:self.window defaultDirectory:self.untitledSavePath andCallback:new save_callback_t(self)];
[DocumentSaveHelper trySaveDocuments:documentsToSave forWindow:self.window defaultDirectory:self.untitledSavePath andCallback:new save_callback_t(self, documentsToSave.size())];
}
// ================