dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Undo Lockwindow Off fix from [r6789] because it caused the taskbar button to become invisible!

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6793 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2016-10-12 19:31:57 +00:00
parent 78bf493cb8
commit d0a461cbca
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/exehead/Ui.c
View file

@ -637,7 +637,7 @@ skipPage:
if (!ui_dlg_visible && m_curwnd)
{
ShowWindow(hwndDlg, SW_SHOWDEFAULT); // BUGBUG: Why is this here, it does not seem to be required?
ShowWindow(hwndDlg, SW_SHOWDEFAULT);
ui_dlg_visible = 1;
}

6
Source/exehead/exec.c
View file

@ -1702,9 +1702,11 @@ static int NSISCALL ExecuteEntry(entry *entry_)
#ifdef NSIS_LOCKWINDOW_SUPPORT
case EW_LOCKWINDOW:
{
// Not using ui_dlg_visible because it is not always in sync and we don't want to risk not painting.
// ui_dlg_visible is 1 or 0, so is parm0. It is used because WM_SETREDRAW will toggle WS_VISIBLE!
// BUGBUG: This has unfortunate consequences when used in
// combination with BringToFront on the first page.
// See http://forums.winamp.com/showthread.php?t=397781 for details.
SendMessage(g_hwnd, WM_SETREDRAW, parm0, 0);
SendMessage(g_hwnd, WM_SETREDRAW, parm0 & ui_dlg_visible, 0);
if (parm0) InvalidateRect(g_hwnd, NULL, FALSE);
break;
}