diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-01 16:56:41 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-01 16:56:41 +0200 |
| commit | ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 (patch) | |
| tree | a961f21249024edee920dc41bb54b2507cf08696 /xorg-server/config | |
| parent | 03418d6378fe72bea2ff4b941792054dd208b65d (diff) | |
| download | vcxsrv-ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4.tar.gz vcxsrv-ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4.tar.bz2 vcxsrv-ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4.zip | |
xkeyboard-config libxcb xserver mesa git update 1 May 2014
xserver commit 2535b76c0d32bc1dd0ddaca06a419a68a4757df1
libxcb commit d978a4f69b30b630f28d07f1003cf290284d24d8
xkeyboard-config commit 5274a69ee85fb6c425c33c631fa8ea1310a8f097
mesa commit a773fdc64da8ba88d8c7f8e383c45248b0c3aa19
Diffstat (limited to 'xorg-server/config')
| -rw-r--r-- | xorg-server/config/dbus-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/config/dbus-core.c b/xorg-server/config/dbus-core.c index b0fd92de4..8351ea4b3 100644 --- a/xorg-server/config/dbus-core.c +++ b/xorg-server/config/dbus-core.c @@ -48,11 +48,11 @@ static struct dbus_core_info bus_info; static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, void *arg); static void -wakeup_handler(void *data, int err, void *read_mask) +wakeup_handler(void *data, int num_fds, void *read_mask) { struct dbus_core_info *info = data; - if (info->connection && FD_ISSET(info->fd, (fd_set *) read_mask)) { + if (info->connection && num_fds > 0 && FD_ISSET(info->fd, (fd_set *) read_mask)) { do { dbus_connection_read_write_dispatch(info->connection, 0); } while (info->connection && |