From 824b31c7f8144a67a320442abd3d854e99d2bfe2 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 23 Apr 2008 02:22:14 -0700 Subject: [PATCH] XQuartz: Make sure QuartzAudioInit() gets run. (cherry picked from commit bb3d034675b70e22e78df5554cab0ec2a3d913d0) --- hw/xquartz/quartz.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index 4d03d02fb..2cba5df2c 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -156,7 +156,7 @@ void QuartzInitOutput( int argc, char **argv ) { - if (serverGeneration == 0) { + if (serverGeneration == 1) { QuartzAudioInit(); } @@ -244,7 +244,7 @@ void QuartzDisplayChangedHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int x, y, width, height, sx, sy; xEvent e; - DEBUG_LOG("QuartzDisplayChangedHandler()\n"); + DEBUG_LOG("QuartzDisplayChangedHandler(): noPseudoramiXExtension=%d, screenInfo.numScreens=%d\n", noPseudoramiXExtension, screenInfo.numScreens); if (noPseudoramiXExtension || screenInfo.numScreens != 1) { /* FIXME: if not using Xinerama, we have multiple screens, and