summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Arver <linusarver@gmail.com>2010-10-17 12:26:01 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2010-11-15 10:57:01 -0800
commit3effb61e207478d92ebbcf5dfc75535cdd2dda12 (patch)
treefaddcc4cb415ca21c1f067a3ad855a81a548f49b
parentacd78f7fdcd348ef4d368003b537a26ab6a5cec6 (diff)
Xext: panoramiXprocs: fix typo
This fixes a typo introduced in commit 80b5d3a3264d2c5167e5ac85a3b04af0f89cece1. The pointer pDst was changed unintentionally to pWin from a copy/paste error. This resulted in all QT-based apps and some tcl/tk ones (like fontforge) to crash X 1.9 on starting up, when Xinerama was enabled. Bug report: https://bbs.archlinux.org/viewtopic.php?id=106125 Signed-off-by: Elie Bleton <drozofil@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Tested-by: Linus Arver <linusarver@gmail.com> (cherry picked from commit 78f94f19aab66a1e5331df0ce29f36e310b4195d)
-rw-r--r--Xext/panoramiXprocs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 67b40304d..d84316895 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
rep.dstX = x - pDst->drawable.x;
rep.dstY = y - pDst->drawable.y;
if((pDst == screenInfo.screens[0]->root) ||
- (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid))
+ (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid))
{
rep.dstX += screenInfo.screens[0]->x;
rep.dstY += screenInfo.screens[0]->y;