From 245908909baa12cf0fca53d8eeb2a6205bf2e5ed Mon Sep 17 00:00:00 2001 From: Tomas Frydrych Date: Mon, 3 Aug 2009 17:11:15 +0100 Subject: [PATCH] Fix check for zero-sized textures in MutterShaped texture Patch by Jon Nettleton http://bugzilla.openedhand.com/show_bug.cgi?id=1538 http://bugzilla.gnome.org/show_bug.cgi?id=590646 --- src/compositor/mutter-shaped-texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compositor/mutter-shaped-texture.c b/src/compositor/mutter-shaped-texture.c index fd35a61c6..bcd78cf83 100755 --- a/src/compositor/mutter-shaped-texture.c +++ b/src/compositor/mutter-shaped-texture.c @@ -274,7 +274,7 @@ mutter_shaped_texture_paint (ClutterActor *actor) tex_width = cogl_texture_get_width (paint_tex); tex_height = cogl_texture_get_height (paint_tex); - if (tex_width == 0 || tex_width == 0) /* no contents yet */ + if (tex_width == 0 || tex_height == 0) /* no contents yet */ return; if (paint_tex == COGL_INVALID_HANDLE) @@ -419,8 +419,8 @@ mutter_shaped_texture_pick (ClutterActor *actor, tex_width = cogl_texture_get_width (paint_tex); tex_height = cogl_texture_get_height (paint_tex); - if (tex_width == 0 || tex_width == 0) /* no contents yet */ - return; + if (tex_width == 0 || tex_height == 0) /* no contents yet */ + return; mutter_shaped_texture_ensure_mask (stex);