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

session: dont attach download dialog to deleted webContents window

Browse source
This commit is contained in:
deepak1556 2016-04-27 20:00:31 +05:30
parent 0fa92923da
commit 46208b5b3e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_session.cc
View file

@ -315,7 +315,7 @@ void Session::OnDownloadCreated(content::DownloadManager* manager,
bool prevent_default = Emit( bool prevent_default = Emit(
"will-download", "will-download",
DownloadItem::Create(isolate(), item), DownloadItem::Create(isolate(), item),
api::WebContents::CreateFrom(isolate(), web_contents)); web_contents);
if (prevent_default) { if (prevent_default) {
item->Cancel(true); item->Cancel(true);
item->Remove(); item->Remove();

4
atom/browser/atom_download_manager_delegate.cc
View file

@ -70,7 +70,9 @@ void AtomDownloadManagerDelegate::OnDownloadPathGenerated(
return; return;
NativeWindow* window = nullptr; NativeWindow* window = nullptr;
auto relay = NativeWindowRelay::FromWebContents(item->GetWebContents()); content::WebContents* web_contents = item->GetWebContents();
auto relay = web_contents ? NativeWindowRelay::FromWebContents(web_contents)
: nullptr;
if (relay) if (relay)
window = relay->window.get(); window = relay->window.get();