From 8c03774e1f05a1b9a87c5231562ba39989604773 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Tue, 12 Jan 2021 15:55:41 +0100
Subject: Updated menu tests to account properly for duplicate keys

---
 config/menu.go | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'config/menu.go')

diff --git a/config/menu.go b/config/menu.go
index 004c7fe..a442036 100644
--- a/config/menu.go
+++ b/config/menu.go
@@ -47,13 +47,12 @@ func (m *Menu) validate(name string) error {
 		return errors.New("YOffset must be a positive integer")
 	}
 	// MenuEntries
-	keys := make(map[string]bool)
+	if len(m.MenuEntries) == 0 {
+		return errors.New("A Menu needs MenuEntries to be valid")
+	}
+	// Duplicate detection is natively handled by the yaml parser
 	for i := 0; i < len(m.MenuEntries); i++ {
 		m.MenuEntries[i].validate()
-		if _, duplicate := keys[m.MenuEntries[i].Key]; duplicate {
-			return errors.New("A Menu has a duplicate key " + m.MenuEntries[i].Key)
-		}
-		keys[m.MenuEntries[i].Key] = true
 		if m.MenuEntries[i].Action == "menu "+name {
 			return errors.New("A menu shall not loop on itself")
 		}
-- 
cgit v1.2.3