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

fix: use try/catch for base class converter error (#24246)

Browse source
This commit is contained in:
Shelley Vohr 2020-07-07 14:18:43 -07:00 • committed by GitHub
parent 446100cdfe
commit cadc142d05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/api/electron_api_base_window.cc
View file

@ -98,10 +98,14 @@ BaseWindow::BaseWindow(v8::Isolate* isolate,
window_->AddObserver(this); window_->AddObserver(this);
#if defined(TOOLKIT_VIEWS) #if defined(TOOLKIT_VIEWS)
// Sets the window icon. {
gin::Handle<NativeImage> icon; v8::TryCatch try_catch(isolate);
if (options.Get(options::kIcon, &icon) && !icon.IsEmpty()) gin::Handle<NativeImage> icon;
SetIcon(icon); if (options.Get(options::kIcon, &icon) && !icon.IsEmpty())
SetIcon(icon);
if (try_catch.HasCaught())
LOG(ERROR) << "Failed to convert NativeImage";
}
#endif #endif
} }