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

Do not block main process for async dialog (#12404)

Browse source
This commit is contained in:
Zhuo Lu 2018-03-22 05:57:33 -07:00 • committed by Shelley Vohr
parent 642f5a84d4
commit c50a460ce6
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/ui/file_dialog_mac.mm
View file

@ -283,8 +283,9 @@ void ShowOpenDialog(const DialogSettings& settings,
if (!settings.parent_window || !settings.parent_window->GetNativeWindow() || if (!settings.parent_window || !settings.parent_window->GetNativeWindow() ||
settings.force_detached) { settings.force_detached) {
int chosen = [dialog runModal]; [dialog beginWithCompletionHandler:^(NSInteger chosen) {
OpenDialogCompletion(chosen, dialog, settings, callback); OpenDialogCompletion(chosen, dialog, settings, callback);
}];
} else { } else {
NSWindow* window = settings.parent_window->GetNativeWindow(); NSWindow* window = settings.parent_window->GetNativeWindow();
[dialog beginSheetModalForWindow:window [dialog beginSheetModalForWindow:window
@ -343,8 +344,9 @@ void ShowSaveDialog(const DialogSettings& settings,
if (!settings.parent_window || !settings.parent_window->GetNativeWindow() || if (!settings.parent_window || !settings.parent_window->GetNativeWindow() ||
settings.force_detached) { settings.force_detached) {
int chosen = [dialog runModal]; [dialog beginWithCompletionHandler:^(NSInteger chosen) {
SaveDialogCompletion(chosen, dialog, settings, callback); SaveDialogCompletion(chosen, dialog, settings, callback);
}];
} else { } else {
NSWindow* window = settings.parent_window->GetNativeWindow(); NSWindow* window = settings.parent_window->GetNativeWindow();
[dialog beginSheetModalForWindow:window [dialog beginSheetModalForWindow:window