github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-03 14:29:50 +08:00
Code Projects Activity

[mac] Fix for cancelling Dialogs. Fixes #1047

Browse Source
This commit is contained in:
Lea Anthony 2021-12-28 20:04:19 +11:00
parent 0571deb290
commit e2f3a11a33
No known key found for this signature in database
GPG Key ID: 33DAF7BB90A58405
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
v2/internal/frontend/desktop/darwin/WailsContext.m
View File

@ -540,6 +540,10 @@
// Setup callback handler // Setup callback handler
[dialog beginSheetModalForWindow:self.mainWindow completionHandler:^(NSModalResponse returnCode) { [dialog beginSheetModalForWindow:self.mainWindow completionHandler:^(NSModalResponse returnCode) {
if ( returnCode != NSModalResponseOK) {
processOpenFileDialogResponse("[]");
return;
}
NSMutableArray *arr = [NSMutableArray new]; NSMutableArray *arr = [NSMutableArray new];
for (NSURL *url in [dialog URLs]) { for (NSURL *url in [dialog URLs]) {
[arr addObject:[url path]]; [arr addObject:[url path]];
@ -592,10 +596,12 @@
// Setup callback handler // Setup callback handler
[dialog beginSheetModalForWindow:self.mainWindow completionHandler:^(NSModalResponse returnCode) { [dialog beginSheetModalForWindow:self.mainWindow completionHandler:^(NSModalResponse returnCode) {
NSURL *url = [dialog URL]; if ( returnCode == NSModalResponseOK ) {
if ( url != nil ) { NSURL *url = [dialog URL];
processSaveFileDialogResponse([url.path UTF8String]); if ( url != nil ) {
return; processSaveFileDialogResponse([url.path UTF8String]);
return;
}
} }
processSaveFileDialogResponse(""); processSaveFileDialogResponse("");
}]; }];