From ff13bd5ed5ccc549eb8bf97960185467b44ca90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Tue, 12 Aug 2008 11:45:06 +0000 Subject: [PATCH] Don't assign the return value to a member variable. svn path=/trunk/KDE/kdebase/workspace/; revision=845784 --- composite.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composite.cpp b/composite.cpp index 74e66a3ebc..e21558fb42 100644 --- a/composite.cpp +++ b/composite.cpp @@ -483,7 +483,7 @@ Pixmap Toplevel::createWindowPixmap() assert( compositing()); grabXServer(); KXErrorHandler err; - window_pix = XCompositeNameWindowPixmap( display(), frameId()); + Pixmap pix = XCompositeNameWindowPixmap( display(), frameId()); // check that the received pixmap is valid and actually matches what we // know about the window (i.e. size) XWindowAttributes attrs; @@ -492,11 +492,11 @@ Pixmap Toplevel::createWindowPixmap() || attrs.width != width() || attrs.height != height() || attrs.map_state != IsViewable ) { kDebug( 1212 ) << "Creating window pixmap failed: " << this; - XFreePixmap( display(), window_pix ); - window_pix = None; + XFreePixmap( display(), pix ); + pix = None; } ungrabXServer(); - return window_pix; + return pix; #else return None; #endif