Merge pull request #6278 from electron/ico-native-image-crash
authorKevin Sawicki <kevin@github.com>
Tue, 28 Jun 2016 19:41:48 +0000 (12:41 -0700)
committerGitHub <noreply@github.com>
Tue, 28 Jun 2016 19:41:48 +0000 (12:41 -0700)
commit49bec9165c8dc476cc6162ddd3767c555123644b
treec80d841f9c90dcea0c4372c41bcd9c3a577532f6
parenta47e30dd82a91347f27c8958d6be04f6a32bfb2f
parent14df90fd19b9081cf3c3964c1ebfd03166e27970
Merge pull request #6278 from electron/ico-native-image-crash

Fix nativeImage.createFromPath for non-existent .ico