First page a skipped custom page with now works again and doesn't enter a infinite loop.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1689 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
1755b3b188
commit
27dc7c79cb
1 changed files with 2 additions and 3 deletions
|
@ -75,7 +75,7 @@ static int num_sections;
|
|||
|
||||
#define WM_TREEVIEW_KEYHACK (WM_USER+0x13)
|
||||
|
||||
static int m_page,m_abort,m_retcode,m_delta;
|
||||
static int m_page=-1,m_abort,m_retcode,m_delta=1;
|
||||
|
||||
static void NSISCALL outernotify(int num) {
|
||||
if (num==0xD1E)
|
||||
|
@ -483,13 +483,12 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
|||
ShowWindow(hwndDlg,SW_SHOW);
|
||||
}
|
||||
|
||||
// initial m_page is zero, m_pages grows and checked after this line so no memory misread
|
||||
this_page=g_inst_page+m_page;
|
||||
|
||||
// if the last page was a custom page, wait for it to finish by itself.
|
||||
// if it doesn't, it's a bad plugin.
|
||||
// plugins should react to WM_NOTIFY_OUTER_NEXT.
|
||||
if (m_delta&&this_page->id<0) return 0;
|
||||
if (m_page>=0&&this_page->id<0) return 0;
|
||||
|
||||
nextPage:
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue