summaryrefslogtreecommitdiffstats
path: root/unix/xserver
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2018-10-26 15:54:56 +0200
committerPierre Ossman <ossman@cendio.se>2018-11-09 17:25:23 +0100
commita4308c9ec45b0ebcafaed2280b442d2840098e4e (patch)
tree243a24171e0a17131f81e12bbcb4fd1f903acc54 /unix/xserver
parent65e08fdc9d783a863b0d0b0acb62c9f3a6b49d63 (diff)
downloadtigervnc-a4308c9ec45b0ebcafaed2280b442d2840098e4e.tar.gz
tigervnc-a4308c9ec45b0ebcafaed2280b442d2840098e4e.zip
Get rid of SocketServer::checkTimeouts()
It doesn't belong on each socket server object as timers are global. Force implementations to call the Timer system directly instead, avoiding any middle men.
Diffstat (limited to 'unix/xserver')
-rw-r--r--unix/xserver/hw/vnc/XserverDesktop.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index d4891c3a..d8b3a4d4 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -368,7 +368,7 @@ void XserverDesktop::blockHandler(int* timeout)
}
// Trigger timers and check when the next will expire
- int nextTimeout = server->checkTimeouts();
+ int nextTimeout = Timer::checkTimeouts();
if (nextTimeout > 0 && (*timeout == -1 || nextTimeout < *timeout))
*timeout = nextTimeout;
} catch (rdr::Exception& e) {