From 7c8a270ed2e9a867003f931cb541a015c9c26c22 Mon Sep 17 00:00:00 2001
From: Christopher Snowhill <kode54@gmail.com>
Date: Sat, 11 Jun 2022 13:37:51 -0700
Subject: [PATCH] [Dialogs] Renamed HDCD toolbar items to be unique

The two toolbars seem to require unique identifiers for each of their
items, even when they're separate toolbars in separate windows.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
---
 Base.lproj/MainMenu.xib | 4 ++--
 Window/MainWindow.m     | 2 +-
 Window/MiniWindow.m     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 88915134a..077024c03 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -899,7 +899,7 @@
                             </connections>
                         </button>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="2DE885D7-56DA-4F25-BD36-0BBA2655C596" explicitItemIdentifier="hdcd" label="HDCD Indicator" paletteLabel="HDCD Indicator" tag="-1" image="hdcdLogoTemplate" bordered="YES" id="ZH9-ZU-skw">
+                    <toolbarItem implicitItemIdentifier="2DE885D7-56DA-4F25-BD36-0BBA2655C596" explicitItemIdentifier="hdcdMain" label="HDCD Indicator" paletteLabel="HDCD Indicator" tag="-1" image="hdcdLogoTemplate" bordered="YES" id="ZH9-ZU-skw">
                         <size key="minSize" width="70" height="25"/>
                         <size key="maxSize" width="70" height="25"/>
                     </toolbarItem>
@@ -1155,7 +1155,7 @@
                             </connections>
                         </button>
                     </toolbarItem>
-                    <toolbarItem implicitItemIdentifier="F1A8365A-DBF5-4BB9-A2B3-3964BFA1B15D" explicitItemIdentifier="hdcd" label="HDCD Indicator" paletteLabel="HDCD Indicator" tag="-1" image="hdcdLogoTemplate" bordered="YES" visibilityPriority="-10" id="qfu-F9-bOZ">
+                    <toolbarItem implicitItemIdentifier="F1A8365A-DBF5-4BB9-A2B3-3964BFA1B15D" explicitItemIdentifier="hdcdMini" label="HDCD Indicator" paletteLabel="HDCD Indicator" tag="-1" image="hdcdLogoTemplate" bordered="YES" visibilityPriority="-10" id="qfu-F9-bOZ">
                         <size key="minSize" width="70" height="25"/>
                         <size key="maxSize" width="70" height="25"/>
                     </toolbarItem>
diff --git a/Window/MainWindow.m b/Window/MainWindow.m
index 4a8e26657..13166e65b 100644
--- a/Window/MainWindow.m
+++ b/Window/MainWindow.m
@@ -31,7 +31,7 @@
 
 - (void)showHDCDLogo:(BOOL)show {
 	for(NSToolbarItem* toolbarItem in [mainToolbar items]) {
-		if([[toolbarItem itemIdentifier] isEqualToString:@"hdcd"]) {
+		if([[toolbarItem itemIdentifier] isEqualToString:@"hdcdMain"]) {
 			if(show)
 				[toolbarItem setImage:hdcdLogo];
 			else
diff --git a/Window/MiniWindow.m b/Window/MiniWindow.m
index f4400dd0a..04f6ea39a 100644
--- a/Window/MiniWindow.m
+++ b/Window/MiniWindow.m
@@ -98,7 +98,7 @@ extern NSString *iTunesDropType;
 
 - (void)showHDCDLogo:(BOOL)show {
 	for(NSToolbarItem *toolbarItem in [miniToolbar items]) {
-		if([[toolbarItem itemIdentifier] isEqualToString:@"hdcd"]) {
+		if([[toolbarItem itemIdentifier] isEqualToString:@"hdcdMini"]) {
 			if(show)
 				[toolbarItem setImage:hdcdLogo];
 			else