netbird/systray
0
0
Fork 0
mirror of https://github.com/netbirdio/systray.git synced 2026-05-22 17:08:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix panic when resources root path is not the working directory

Browse Source
This commit is contained in:
Kevin Subileau
2019-12-09 20:15:07 +01:00
committed by GitHub
parent 6658a36a33
commit f226302edc
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
systray_windows.go
+7 -4
View File
@@ -6,6 +6,7 @@ import (
"crypto/md5"
"fmt"
"io/ioutil"
"path/filepath"
"os"
"sync/atomic"
@@ -79,15 +80,16 @@ func quit() {
func SetIcon(iconBytes []byte) {
md5 := md5.Sum(iconBytes)
filename := fmt.Sprintf("systray.%x.ico", md5)
iconpath := filepath.Join(walk.Resources.RootDirPath(), filename)
// First, try to find a previously loaded icon in walk cache
icon, err := walk.Resources.Icon(filename)
if err != nil {
// Cache miss, load the icon
err := ioutil.WriteFile(filename, iconBytes, 0644)
err := ioutil.WriteFile(iconpath, iconBytes, 0644)
if err != nil {
fail("Unable to save icon to disk", err)
}
defer os.Remove(filename)
defer os.Remove(iconpath)
icon, err = walk.Resources.Icon(filename)
if err != nil {
fail("Unable to load icon", err)
@@ -162,15 +164,16 @@ func addOrUpdateMenuItem(item *MenuItem) {
func (item *MenuItem) SetIcon(iconBytes []byte) {
md5 := md5.Sum(iconBytes)
filename := fmt.Sprintf("systray.%x.ico", md5)
iconpath := filepath.Join(walk.Resources.RootDirPath(), filename)
// First, try to find a previously loaded icon in walk cache
icon, err := walk.Resources.Image(filename)
if err != nil {
// Cache miss, load the icon
err := ioutil.WriteFile(filename, iconBytes, 0644)
err := ioutil.WriteFile(iconpath, iconBytes, 0644)
if err != nil {
fail("Unable to save icon to disk", err)
}
defer os.Remove(filename)
defer os.Remove(iconpath)
icon, err = walk.Resources.Image(filename)
if err != nil {
fail("Unable to load icon", err)