Merge pull request #6091 from electron/icon-progress-crash
authorCheng Zhao <zcbenz@gmail.com>
Fri, 17 Jun 2016 03:29:49 +0000 (03:29 +0000)
committerGitHub <noreply@github.com>
Fri, 17 Jun 2016 03:29:49 +0000 (03:29 +0000)
Fix crash setting progress after setting dock icon

1  2 
atom/browser/native_window_mac.mm

Simple merge