diff --git a/rfbplayer/rfbplayer.cxx b/rfbplayer/rfbplayer.cxx
index 0993654..41f36ca 100644
--- a/rfbplayer/rfbplayer.cxx
+++ b/rfbplayer/rfbplayer.cxx
@@ -203,7 +203,7 @@
   autoplay(_autoplay), showControls(_showControls), buffer(0), client_size(0, 0, 32, 32), 
   window_size(0, 0, 32, 32), cutText(0), seekMode(false), fileName(_fileName), 
   serverInitTime(0), lastPos(0), timeStatic(0), speedEdit(0), speedTrackBar(0),
-  speedUpDown(0), acceptBell(_acceptBell) {
+  speedUpDown(0), acceptBell(_acceptBell), rfbReader(0) {
 
   if (showControls)
     CTRL_BAR_HEIGHT = 28;
@@ -229,6 +229,11 @@
 
 RfbPlayer::~RfbPlayer() {
   vlog.debug("~RfbPlayer");
+  if (rfbReader) {
+    rfbReader->stop();
+    delete rfbReader->join();
+    rfbReader = 0;
+  }
   if (mainHwnd) {
     setVisible(false);
     DestroyWindow(mainHwnd);