summaryrefslogtreecommitdiff
path: root/hw/xquartz
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-04-23 02:22:14 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-04-23 02:22:28 -0700
commit76381092e8f650ec7d1f058fa4c8a7348893f775 (patch)
treef065fb639ee513a53d3b9ee0f305306e0f352a0a /hw/xquartz
parent00815b3e5223e822f306db45cd4884a22ac9f7ed (diff)
XQuartz: Make sure QuartzAudioInit() gets run.
(cherry picked from commit bb3d034675b70e22e78df5554cab0ec2a3d913d0) (cherry picked from commit 824b31c7f8144a67a320442abd3d854e99d2bfe2)
Diffstat (limited to 'hw/xquartz')
-rw-r--r--hw/xquartz/quartz.c4
1 files 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