ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cocoa Port: Whenever attempting to take a screenshot using the Screenshot Capture Tool, simply cancel the operation altogether if the target directory does not exist or is not writable.

This commit is contained in:
rogerman 2017-10-16 12:11:57 -07:00
parent 7d2c70b7a8
commit c31a5717ab
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
desmume/src/frontend/cocoa/userinterface/MacScreenshotCaptureTool.mm
View File

@ -109,6 +109,8 @@
{ {
NSString *savePath = [self saveDirectoryPath]; NSString *savePath = [self saveDirectoryPath];
// Check for the existence of the target writable directory. Cancel the take screenshot operation
// if the directory does not exist or is not writable.
if ( (savePath != nil) && ([savePath length] > 0) ) if ( (savePath != nil) && ([savePath length] > 0) )
{ {
savePath = [savePath stringByExpandingTildeInPath]; savePath = [savePath stringByExpandingTildeInPath];
@ -116,6 +118,7 @@
else else
{ {
[self chooseDirectoryPath:self]; [self chooseDirectoryPath:self];
return;
} }
NSFileManager *fileManager = [[NSFileManager alloc] init]; NSFileManager *fileManager = [[NSFileManager alloc] init];
@ -123,19 +126,13 @@
if (!isDirectoryFound) if (!isDirectoryFound)
{ {
// This was the last chance for the user to try to get a working writable directory.
[self chooseDirectoryPath:self]; [self chooseDirectoryPath:self];
isDirectoryFound = [fileManager createDirectoryAtPath:savePath withIntermediateDirectories:YES attributes:nil error:nil]; [fileManager release];
return;
} }
[fileManager release]; [fileManager release];
if (!isDirectoryFound)
{
// If the directory is still invalid, then just bail.
return;
}
// Note: We're allocating the parameter's memory block here, but we will be freeing it once we copy it in the detached thread. // Note: We're allocating the parameter's memory block here, but we will be freeing it once we copy it in the detached thread.
MacScreenshotCaptureToolParams *param = new MacScreenshotCaptureToolParams; MacScreenshotCaptureToolParams *param = new MacScreenshotCaptureToolParams;
param->sharedData = [self sharedData]; param->sharedData = [self sharedData];