v2.0.0-alpha.47

v2/cmd/wails/version.go

@@ -1,3 +1,3 @@
 package main
 
-var version = "v2.0.0-alpha.45"
+var version = "v2.0.0-alpha.47"

v2/internal/ffenestri/traymenu_darwin.c

@@ -82,8 +82,18 @@ void UpdateTrayIcon(TrayMenu *trayMenu) {
     }
 
     id trayImage = hashmap_get(&trayIconCache, trayMenu->icon, strlen(trayMenu->icon));
+
+    // If we don't have the image in the icon cache then assume it's base64 encoded image data
+    if (trayImage == NULL) {
+        id data = ALLOC("NSData");
+        id imageData = msg(data, s("initWithBase64EncodedString:options:"), str(trayMenu->icon), 0);
+        trayImage = ALLOC("NSImage");
+        msg(trayImage, s("initWithData:"), imageData);
+    }
+
     msg(statusBarButton, s("setImagePosition:"), trayMenu->trayIconPosition);
     msg(statusBarButton, s("setImage:"), trayImage);
+
 }
 
 void ShowTrayMenu(TrayMenu* trayMenu) {

v2/internal/subsystem/url.go

@@ -68,6 +68,10 @@ func (u *URL) Start() error {
 				u.wg.Done()
 				return
 			case urlMessage := <-u.urlChannel:
+				// Guard against nil messages
+				if urlMessage == nil {
+					continue
+				}
 				messageType := strings.TrimPrefix(urlMessage.Topic(), "url:")
 				switch messageType {
 				case "handler":

v2/pkg/menu/keys/keys.go

@@ -30,7 +30,8 @@ var modifierMap = map[string]Modifier{
 }
 
 func parseModifier(text string) (*Modifier, error) {
-	result, valid := modifierMap[text]
+	lowertext := strings.ToLower(text)
+	result, valid := modifierMap[lowertext]
 	if !valid {
 		return nil, fmt.Errorf("'%s' is not a valid modifier", text)
 	}