From 87b1115db1aeb39d09fa5cdf349b1c0d6fea7d9f Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Wed, 6 Nov 2013 11:59:16 -0700 Subject: [PATCH] hhctrl.ocx: Do not destroy the HTML Help window when HH_HELP_CONTEXT finds no context id of 0. --- dlls/hhctrl.ocx/hhctrl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 339271546a7..8b425693f23 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -273,6 +273,8 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat url = FindContextAlias(info->pCHMInfo, data); if(!url) { + if(!data) /* there may legitimately be no context alias for id 0 */ + return info->WinType.hwndHelp; ReleaseHelpViewer(info); return NULL; }