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

fixup! Stop using deprecated NSSavePanel/NSOpenPanel methods

Browse Source 
Be careful not to initialize an NSURL from nil.
This commit is contained in:
Allan Odgaard
2012-08-12 22:18:13 +02:00
parent 2ff7684eda
commit a92c7cda68
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Frameworks/Find/src/FFWindowController.mm
View File

@@ -450,8 +450,8 @@ struct operation_t
openPanel.title = @"Find in Folder";
openPanel.canChooseFiles = NO;
openPanel.canChooseDirectories = YES;
NSString* startPath = self.isSearchingFolders ? self.searchFolder : nil;
openPanel.directoryURL = [NSURL fileURLWithPath:startPath];
if(self.isSearchingFolders && self.searchFolder)
openPanel.directoryURL = [NSURL fileURLWithPath:self.searchFolder];
if([[self window] isVisible])
{
[openPanel beginSheetModalForWindow:[self window] completionHandler:^(NSInteger result) {

3
Frameworks/OakAppKit/src/OakSavePanel.mm
View File

@@ -13,7 +13,8 @@
NSSavePanel* savePanel = [NSSavePanel savePanel];
[savePanel setTreatsFilePackagesAsDirectories:YES];
[savePanel setDirectoryURL:[NSURL fileURLWithPath:aDirectorySuggestion]];
if(aDirectorySuggestion)
[savePanel setDirectoryURL:[NSURL fileURLWithPath:aDirectorySuggestion]];
[savePanel setNameFieldStringValue:[aPathSuggestion lastPathComponent]];
[savePanel beginSheetModalForWindow:aWindow completionHandler:^(NSInteger result) {
NSString* path = result == NSOKButton ? [[savePanel.URL filePathURL] path] : nil;