Unlock right after pre func

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1681 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-11-11 20:24:26 +00:00
parent 85ee7cbd0a
commit b9381d0d5d

View file

@ -528,6 +528,7 @@ nextPage:
if (ExecuteCodeSegment(this_page->prefunc,NULL) || this_page->id<0) if (ExecuteCodeSegment(this_page->prefunc,NULL) || this_page->id<0)
goto nextPage; goto nextPage;
#endif //NSIS_SUPPORT_CODECALLBACKS #endif //NSIS_SUPPORT_CODECALLBACKS
LockWindowUpdate(0);
if (this_page->id>=0) // NSIS page if (this_page->id>=0) // NSIS page
{ {
gDontFookWithFocus = 0; gDontFookWithFocus = 0;
@ -538,6 +539,9 @@ nextPage:
GetWindowRect(GetDlgItem(hwndDlg,IDC_CHILDRECT),&r); GetWindowRect(GetDlgItem(hwndDlg,IDC_CHILDRECT),&r);
ScreenToClient(hwndDlg,(LPPOINT)&r); ScreenToClient(hwndDlg,(LPPOINT)&r);
SetWindowPos(m_curwnd,0,r.left,r.top,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER); SetWindowPos(m_curwnd,0,r.left,r.top,0,0,SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER);
#ifdef NSIS_SUPPORT_CODECALLBACKS
ExecuteCodeSegment(this_page->postfunc,NULL);
#endif //NSIS_SUPPORT_CODECALLBACKS
SendMessage(m_curwnd, WM_NOTIFY_START, 0, 0); SendMessage(m_curwnd, WM_NOTIFY_START, 0, 0);
ShowWindow(m_curwnd,SW_SHOWNA); ShowWindow(m_curwnd,SW_SHOWNA);
} }
@ -549,12 +553,6 @@ nextPage:
SetFocus(m_hwndOK); SetFocus(m_hwndOK);
//XGE End //XGE End
} }
#ifdef NSIS_SUPPORT_CODECALLBACKS
ExecuteCodeSegment(this_page->postfunc,NULL);
#endif //NSIS_SUPPORT_CODECALLBACKS
LockWindowUpdate(0);
} }
} }
if (uMsg == WM_COMMAND) if (uMsg == WM_COMMAND)