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

Ensure we have a document in tab drop action method

Browse Source 
Some crash reports indicate that we do not have a document, although I can’t think of why such situation would arise.
This commit is contained in:
Allan Odgaard
2014-03-30 21:45:31 +07:00
parent a63edc149f
commit 04cd55303a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1653,10 +1653,12 @@ namespace
- (BOOL)performTabDropFromTabBar:(OakTabBarView*)aTabBar atIndex:(NSUInteger)droppedIndex fromPasteboard:(NSPasteboard*)aPasteboard operation:(NSDragOperation)operation
{
NSDictionary* plist = [aPasteboard propertyListForType:OakDocumentPboardType];
oak::uuid_t docId = to_s((NSString*)plist[@"document"]);
document::document_ptr srcDocument = document::find(to_s((NSString*)plist[@"document"]));
if(!srcDocument)
return NO;
std::vector<document::document_ptr> newDocuments;
merge_documents_splitting_at(_documents, make_vector(document::find(docId)), droppedIndex, newDocuments);
merge_documents_splitting_at(_documents, make_vector(srcDocument), droppedIndex, newDocuments);
self.documents = newDocuments;
if(_selectedDocument)