summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
Diffstat (limited to 'unix')
-rw-r--r--unix/xserver/hw/vnc/XserverDesktop.cc3
-rw-r--r--unix/xserver/hw/vnc/XserverDesktop.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index 8f50cf9d..60254aec 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -145,7 +145,7 @@ XserverDesktop::XserverDesktop(ScreenPtr pScreen_,
network::TcpListener* httpListener_,
const char* name, const rfb::PixelFormat &pf,
void* fbptr, int stride)
- : pScreen(pScreen_), deferredUpdateTimer(0), dummyTimer(0),
+ : pScreen(pScreen_), deferredUpdateTimer(0),
server(0), httpServer(0),
listener(listener_), httpListener(httpListener_),
cmap(0), deferredUpdateTimerSet(false),
@@ -172,7 +172,6 @@ XserverDesktop::~XserverDesktop()
if (!directFbptr)
delete [] data;
TimerFree(deferredUpdateTimer);
- TimerFree(dummyTimer);
delete inputDevice;
delete httpServer;
delete server;
diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
index fd0773ca..4a1705ea 100644
--- a/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@ -126,7 +126,7 @@ private:
void deferUpdate();
ScreenPtr pScreen;
InputDevice *inputDevice;
- OsTimerPtr deferredUpdateTimer, dummyTimer;
+ OsTimerPtr deferredUpdateTimer;
rfb::VNCServerST* server;
rfb::HTTPServer* httpServer;
network::TcpListener* listener;