From 1da48c414962fd59a1b0fd7828295b3468ad0e0a Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Thu, 15 Apr 2010 18:56:34 +0000
Subject: [PATCH] Simplify the SetTrigger() code. The trigger is a single byte
 char anyway, so no need to convert the looked up label position to a char
 code. Also actually make sure that the trigger is lower case by doing an
 explicit tolower() instead of assuming that it already is.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36316 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/interface/MenuItem.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/kits/interface/MenuItem.cpp b/src/kits/interface/MenuItem.cpp
index a78eedeb79..5d2dd98c8c 100644
--- a/src/kits/interface/MenuItem.cpp
+++ b/src/kits/interface/MenuItem.cpp
@@ -245,13 +245,16 @@ BMenuItem::SetTrigger(char trigger)
 	// try uppercase letters first
 
 	const char* pos = strchr(Label(), toupper(trigger));
+	trigger = tolower(trigger);
+
 	if (pos == NULL) {
 		// take lowercase, too
 		pos = strchr(Label(), trigger);
 	}
+
 	if (pos != NULL) {
 		fTriggerIndex = UTF8CountChars(Label(), pos - Label());
-		fTrigger = tolower(UTF8ToCharCode(&pos));
+		fTrigger = trigger;
 	} else {
 		fTrigger = 0;
 		fTriggerIndex = -1;