diff options
| -rw-r--r-- | libvncserver/main.c | 11 | ||||
| -rw-r--r-- | libvncserver/sockets.c | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/libvncserver/main.c b/libvncserver/main.c index 4cb18ac..b8cdde1 100644 --- a/libvncserver/main.c +++ b/libvncserver/main.c @@ -1061,10 +1061,13 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) { if(disconnectClients) { rfbClientPtr cl; rfbClientIteratorPtr iter = rfbGetClientIterator(screen); - while( (cl = rfbClientIteratorNext(iter)) ) - if (cl->sock > -1) - /* we don't care about maxfd here, because the server goes away */ - rfbCloseClient(cl); + while( (cl = rfbClientIteratorNext(iter)) ) { + if (cl->sock > -1) { + /* we don't care about maxfd here, because the server goes away */ + rfbCloseClient(cl); + rfbClientConnectionGone(cl); + } + } rfbReleaseClientIterator(iter); } diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c index ddd8450..d2f814b 100644 --- a/libvncserver/sockets.c +++ b/libvncserver/sockets.c @@ -122,8 +122,9 @@ rfbInitSockets(rfbScreenInfoPtr rfbScreen) { in_addr_t iface = rfbScreen->listenInterface; - if (rfbScreen->socketState!=RFB_SOCKET_INIT) - return; + if (rfbScreen->socketState == RFB_SOCKET_READY) { + return; + } rfbScreen->socketState = RFB_SOCKET_READY; |
