changeset 7567:6c8a00ff5837

8042609: Limit splashiness of splash images Reviewed-by: mschoene, serb
author azvegint
date Fri, 30 May 2014 16:20:04 +0400
parents 1c1549cbed1b
children e4d181d8ab2a
files src/windows/native/sun/awt/splashscreen/splashscreen_sys.c
diffstat 1 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c	Thu May 29 19:43:14 2014 +0100
+++ b/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c	Fri May 30 16:20:04 2014 +0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2008, 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 @@
 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 @@
             time = 0;
         SetTimer(splash->hWnd, 0, time, NULL);
     }
-    else {
-        KillTimer(splash->hWnd, 0);
-    }
 }
 
 void SplashReconfigureNow(Splash * splash) {