Mercurial > hg > release > icedtea7-forest-2.5 > jdk
changeset 8160:4ced6a9ddaaa
8060461: Fix for JDK-8042609 uncovers additional issue
Reviewed-by: ahgross, prr, serb
author | azvegint |
---|---|
date | Tue, 11 Nov 2014 17:45:02 +0300 |
parents | fdcee3cb638e |
children | 9e69fb9109d1 |
files | src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c |
diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c Mon Feb 09 14:21:07 2015 +0400 +++ b/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c Tue Nov 11 17:45:02 2014 +0300 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, 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 @@ -288,9 +288,7 @@ /* for changing the visible shape of a window to an nonrectangular form */ void SplashUpdateShape(Splash * splash) { - if (!shapeSupported) - return; - if (!splash->maskRequired) { + if (splash->currentFrame < 0 || !shapeSupported || !splash->maskRequired) { return; } XShapeCombineRectangles(splash->display, splash->window, ShapeClip, 0, 0, @@ -331,6 +329,10 @@ void SplashRedrawWindow(Splash * splash) { + if (splash->currentFrame < 0) { + return; + } + XImage *ximage; // making this method redraw a part of the image does not make