From 482654c18c6f9a0e0d8b2734ff9480fbdb83549b Mon Sep 17 00:00:00 2001 From: azvegint Date: Fri, 30 May 2014 16:19:01 +0400 Subject: [PATCH] 8042609: Limit splashiness of splash images Reviewed-by: mschoene, serb --- .../native/sun/awt/splashscreen/splashscreen_sys.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c b/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c index ddbc00695..8e02c1869 100644 --- a/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c +++ b/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -213,6 +213,14 @@ SplashPaint(Splash * splash, HDC hdc) void SplashRedrawWindow(Splash * splash) { + if (!SplashIsStillLooping(splash)) { + KillTimer(splash->hWnd, 0); + } + + if (splash->currentFrame < 0) { + return; + } + SplashUpdateScreenData(splash); if (splash->isLayered) { BLENDFUNCTION bf; @@ -303,9 +311,6 @@ SplashRedrawWindow(Splash * splash) time = 0; SetTimer(splash->hWnd, 0, time, NULL); } - else { - KillTimer(splash->hWnd, 0); - } } void SplashReconfigureNow(Splash * splash) { -- GitLab