From: Alan Third <alan@idiocy.org>
Date: Wed, 25 Aug 2021 18:50:27 +0000 (+0100)
Subject: Make NS toolbar item ID more unique (bug#50160)
X-Git-Tag: emacs-29.0.90~3500
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=89749a62b51e19a39f145a1985ae5992c58c6776;p=emacs.git

Make NS toolbar item ID more unique (bug#50160)

* src/nsmenu.m
([EmacsToolbar addDisplayItemWithImage:idx:tag:labelText:helpText:enabled:]):
Add the label to the identifier to avoid collisions between toolbar
items that use the same image.
---

diff --git a/src/nsmenu.m b/src/nsmenu.m
index f42cd387022..d15386641f8 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -1255,8 +1255,8 @@ update_frame_tool_bar (struct frame *f)
   NSTRACE ("[EmacsToolbar addDisplayItemWithImage: ...]");
 
   /* 1) come up w/identifier */
-  NSString *identifier
-    = [NSString stringWithFormat: @"%lu", (unsigned long)[img hash]];
+  NSString *identifier = [NSString stringWithFormat: @"%lu%@",
+                                   (unsigned long)[img hash], label];
   [activeIdentifiers addObject: identifier];
 
   /* 2) create / reuse item */