Eric Pouech : winhelp: When opening a page, don' t reopen the same page from macro, even if requested.
Module: wine Branch: master Commit: 79af1859fa9096e45267492afe3abb7081902f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79af1859fa9096e45267492afe... Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Jun 2 22:22:53 2010 +0200 winhelp: When opening a page, don't reopen the same page from macro, even if requested. --- programs/winhlp32/winhelp.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 2396917..1f92514 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -716,6 +716,14 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe SIZE sz = {0, 0}; DWORD flags = SWP_NOSIZE | SWP_NOMOVE; + if (win->page == wpage->page && win->info == wpage->wininfo) + { + /* see #22979, some hlp files have a macro (run at page opening), which + * jumps to the very same page + * Exit gracefully in that case + */ + return TRUE; + } WINHELP_DeleteButtons(win); bReUsed = TRUE; SetWindowText(win->hMainWnd, WINHELP_GetCaption(wpage));
participants (1)
-
Alexandre Julliard