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

Do not throw if the named image can not be found

Browse source
This commit is contained in:
Samuel Attard 2017-10-10 03:18:44 +11:00
parent ec610cd97b
commit 767a178bd1
2 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom/common/api/atom_api_native_image.cc
View file

@ -544,7 +544,6 @@ mate::Handle<NativeImage> NativeImage::CreateFromDataURL(
#if !defined(OS_MACOSX) #if !defined(OS_MACOSX)
mate::Handle<NativeImage> NativeImage::CreateFromNamedImage( mate::Handle<NativeImage> NativeImage::CreateFromNamedImage(
mate::Arguments* args, const std::string& name) { mate::Arguments* args, const std::string& name) {
args->ThrowError("Cannot create NativeImage from a name on non-darwin platforms");
return CreateEmpty(args->isolate()); return CreateEmpty(args->isolate());
} }
#endif #endif

1
atom/common/api/atom_api_native_image_mac.mm
View file

@ -17,7 +17,6 @@ mate::Handle<NativeImage> NativeImage::CreateFromNamedImage(
@autoreleasepool { @autoreleasepool {
NSImage* image = [NSImage imageNamed:base::SysUTF8ToNSString(name)]; NSImage* image = [NSImage imageNamed:base::SysUTF8ToNSString(name)];
if (!image.valid) { if (!image.valid) {
args->ThrowError("Cannot create image from name: " + name);
return CreateEmpty(args->isolate()); return CreateEmpty(args->isolate());
} }