Skip to content

W
wine-winehq
Commit b4f2c552 authored by Owen Rudge's avatar Owen Rudge Committed by Alexandre Julliard
Browse files
Options

winhlp32: Ensure win->page is not NULL when selecting Help on Help.

parent 5e289b91
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
programs/winhlp32/macro.c
View file @ b4f2c552
...@@ -446,10 +446,13 @@ static void CALLBACK MACRO_GotoMark(LPCSTR str) ...@@ -446,10 +446,13 @@ static void CALLBACK MACRO_GotoMark(LPCSTR str)
void CALLBACK MACRO_HelpOn(void) void CALLBACK MACRO_HelpOn(void)
{ {
LPCSTR file; WINHELP_WINDOW *win = MACRO_CurrentWindow();
LPCSTR file = NULL;
WINE_TRACE("()\n"); WINE_TRACE("()\n");
file = MACRO_CurrentWindow()->page->file->help_on_file; if (win && win->page && win->page->file)
file = win->page->file->help_on_file;
if (!file) if (!file)
file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp"; file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment