From 2b51a6b641a6c8ba073e711d561702139bb3ebfb Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 8 Jan 2005 14:04:45 +0000 Subject: [PATCH] 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 --- Contrib/AdvSplash/advsplash.c | 3 ++- Plugins/advsplash.dll | Bin 5120 -> 6144 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Contrib/AdvSplash/advsplash.c b/Contrib/AdvSplash/advsplash.c index 75781161..11ecb686 100644 --- a/Contrib/AdvSplash/advsplash.c +++ b/Contrib/AdvSplash/advsplash.c @@ -202,11 +202,13 @@ void __declspec(dllexport) show(HWND hwndParent, int string_size, resolution = sleep_val + fadein_val + fadeout_val; fadeout_val = fadein_val = 0; sleep_val = 1; + state = 1; // skip fade in } else { // div them by resolution sleep_val >>= 5; fadein_val >>= 5; fadeout_val >>= 5; + state = 0; alphaparam = LWA_ALPHA | ((keycolor == -1) ? (0) : (LWA_COLORKEY)); keycolor = @@ -261,7 +263,6 @@ void __declspec(dllexport) show(HWND hwndParent, int string_size, PlaySound(fn2, NULL, SND_ASYNC | SND_FILENAME | SND_NODEFAULT); // Start up timer... - state = 0; timeleft = fadein_val; timerEvent = timeSetEvent(resolution, RESOLUTION / 4, TimeProc, diff --git a/Plugins/advsplash.dll b/Plugins/advsplash.dll index 906d57c6b7c0f2f08d256ac8854c14bb022a938b..926d2f83aefa15e7ed2aff1a17331cf8015a7cb7 100644 GIT binary patch literal 6144 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 literal 5120 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 KU4q5$E&M-qBGiHa