[PATCH] [WinHelp]: fix for 15367

Eric Pouech eric.pouech at orange.fr
Tue Sep 23 14:12:04 CDT 2008




A+
---

 programs/winhlp32/macro.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c
index 7179dca..2609187 100644
--- a/programs/winhlp32/macro.c
+++ b/programs/winhlp32/macro.c
@@ -555,10 +555,11 @@ void CALLBACK MACRO_GotoMark(LPCSTR str)
 
 void CALLBACK MACRO_HelpOn(void)
 {
-    LPCSTR      file;
+    LPCSTR      file = NULL;
 
     WINE_TRACE("()\n");
-    file = Globals.active_win->page->file->help_on_file;
+    if (Globals.active_win && Globals.active_win->page && Globals.active_win->page->file)
+        file = Globals.active_win->page->file->help_on_file;
     if (!file)
         file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp";
 





More information about the wine-patches mailing list