fixed doubled delay for !nt50 mode
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3848 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
3b5782aa07
commit
2b51a6b641
2 changed files with 2 additions and 1 deletions
|
@ -202,11 +202,13 @@ void __declspec(dllexport) show(HWND hwndParent, int string_size,
|
||||||
resolution = sleep_val + fadein_val + fadeout_val;
|
resolution = sleep_val + fadein_val + fadeout_val;
|
||||||
fadeout_val = fadein_val = 0;
|
fadeout_val = fadein_val = 0;
|
||||||
sleep_val = 1;
|
sleep_val = 1;
|
||||||
|
state = 1; // skip fade in
|
||||||
} else {
|
} else {
|
||||||
// div them by resolution
|
// div them by resolution
|
||||||
sleep_val >>= 5;
|
sleep_val >>= 5;
|
||||||
fadein_val >>= 5;
|
fadein_val >>= 5;
|
||||||
fadeout_val >>= 5;
|
fadeout_val >>= 5;
|
||||||
|
state = 0;
|
||||||
|
|
||||||
alphaparam = LWA_ALPHA | ((keycolor == -1) ? (0) : (LWA_COLORKEY));
|
alphaparam = LWA_ALPHA | ((keycolor == -1) ? (0) : (LWA_COLORKEY));
|
||||||
keycolor =
|
keycolor =
|
||||||
|
@ -261,7 +263,6 @@ void __declspec(dllexport) show(HWND hwndParent, int string_size,
|
||||||
PlaySound(fn2, NULL, SND_ASYNC | SND_FILENAME | SND_NODEFAULT);
|
PlaySound(fn2, NULL, SND_ASYNC | SND_FILENAME | SND_NODEFAULT);
|
||||||
|
|
||||||
// Start up timer...
|
// Start up timer...
|
||||||
state = 0;
|
|
||||||
timeleft = fadein_val;
|
timeleft = fadein_val;
|
||||||
timerEvent =
|
timerEvent =
|
||||||
timeSetEvent(resolution, RESOLUTION / 4, TimeProc,
|
timeSetEvent(resolution, RESOLUTION / 4, TimeProc,
|
||||||
|
|
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue