mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1387 from deepak1556/shell_patch

Browse source 
shell: fix regression for moveItemToTrash on mac
This commit is contained in:
Cheng Zhao 2015-04-13 14:51:59 +08:00
commit eddb23d56b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/common/platform_util_mac.mm
View file

@ -131,7 +131,7 @@ bool MoveItemToTrash(const base::FilePath& full_path) {
NSString* path_string = base::SysUTF8ToNSString(full_path.value()); NSString* path_string = base::SysUTF8ToNSString(full_path.value());
NSArray* file_array = NSArray* file_array =
[NSArray arrayWithObject:[path_string lastPathComponent]]; [NSArray arrayWithObject:[path_string lastPathComponent]];
int status = [[NSWorkspace sharedWorkspace] BOOL status = [[NSWorkspace sharedWorkspace]
performFileOperation:NSWorkspaceRecycleOperation performFileOperation:NSWorkspaceRecycleOperation
source:[path_string stringByDeletingLastPathComponent] source:[path_string stringByDeletingLastPathComponent]
destination:@"" destination:@""
@ -140,7 +140,7 @@ bool MoveItemToTrash(const base::FilePath& full_path) {
if (!path_string || !file_array || !status) if (!path_string || !file_array || !status)
LOG(WARNING) << "NSWorkspace failed to move file " << full_path.value() LOG(WARNING) << "NSWorkspace failed to move file " << full_path.value()
<< " to trash"; << " to trash";
return (status == 0); return status;
} }
void Beep() { void Beep() {