diff options
Diffstat (limited to 'win/rfb_win32/SocketManager.cxx')
| -rw-r--r-- | win/rfb_win32/SocketManager.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/win/rfb_win32/SocketManager.cxx b/win/rfb_win32/SocketManager.cxx index 027536fd..c2fba0fb 100644 --- a/win/rfb_win32/SocketManager.cxx +++ b/win/rfb_win32/SocketManager.cxx @@ -165,7 +165,9 @@ void SocketManager::setDisable(network::SocketServer* srvr, bool disable) int SocketManager::checkTimeouts() { int timeout = EventManager::checkTimeouts(); - soonestTimeout(&timeout, Timer::checkTimeouts()); + int nextTimeout = Timer::checkTimeouts(); + if (nextTimeout >= 0 && nextTimeout < timeout) + timeout = nextTimeout; std::list<network::Socket*> shutdownSocks; std::map<HANDLE,ConnInfo>::iterator j, j_next; |