From fe090969f4f23ae0b4b81d9cc45292a4ae3b13f6 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 22 Dec 2011 21:27:17 +0000
Subject: [PATCH] Actually use the value from the "Always" context in
 Hotkey::GetHotkey

Originally committed to SVN as r6113.
---
 aegisub/libaegisub/common/hotkey.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aegisub/libaegisub/common/hotkey.cpp b/aegisub/libaegisub/common/hotkey.cpp
index 190677b2f..7943f07e4 100644
--- a/aegisub/libaegisub/common/hotkey.cpp
+++ b/aegisub/libaegisub/common/hotkey.cpp
@@ -145,7 +145,7 @@ std::string Hotkey::GetHotkey(const std::string &context, const std::string &com
 		if (ctext == "Default")
 			ret = it->second.StrMenu();
 		else if (ret.empty() && ctext == "Always")
-			it->second.StrMenu();
+			ret = it->second.StrMenu();
 	}
 	return ret;
 }