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

Fix crash when using file chooser in BrowserView

Browse source 
The crash was a segfault caused by a null `WebDialogHelper::window_`.
This commit is contained in:
Birunthan Mohanathas 2017-06-21 16:21:28 -07:00
parent 3abeb6e2bc
commit eb19562316
6 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/web_dialog_helper.cc
View file

@ -195,6 +195,10 @@ void WebDialogHelper::RunFileChooser(
AtomBrowserContext* browser_context = static_cast<AtomBrowserContext*>(
window_->web_contents()->GetBrowserContext());
if (!browser_context) {
browser_context = static_cast<atom::AtomBrowserContext*>(
render_frame_host->GetProcess()->GetBrowserContext());
}
settings.default_path = browser_context->prefs()->GetFilePath(
prefs::kSelectFileLastDirectory).Append(params.default_file_name);
settings.properties = flags;