summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-07-12 07:59:43 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-07-12 07:59:43 +0000
commita36fb8e8cdc86ef569c4e75eebabbf341f801ffb (patch)
treed74c164835b948982f77430d3f03341a95ff2c73
parentefb5fdfa3f31b1c57b9253cd2d062e61d9574c37 (diff)
crash fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@14540 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--src/mir_app/src/menu_clist.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mir_app/src/menu_clist.cpp b/src/mir_app/src/menu_clist.cpp
index 18afbc785a..273cf5e7b4 100644
--- a/src/mir_app/src/menu_clist.cpp
+++ b/src/mir_app/src/menu_clist.cpp
@@ -955,6 +955,9 @@ void RebuildMenuOrder(void)
static int sttRebuildHotkeys(WPARAM, LPARAM)
{
for (int j = 0; j < _countof(statusModeList); j++) {
+ if (hStatusMainMenuHandles[j] == NULL)
+ continue;
+
TCHAR buf[256], hotkeyName[100];
WORD hotKey = GetHotkeyValue(statusHotkeys[j]);
HotkeyToName(hotkeyName, _countof(hotkeyName), HIBYTE(hotKey), LOBYTE(hotKey));