diff options
| -rw-r--r-- | rfbplayer/rfbSessionReader.h | 8 | ||||
| -rw-r--r-- | rfbplayer/rfbplayer.cxx | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/rfbplayer/rfbSessionReader.h b/rfbplayer/rfbSessionReader.h index 06941b1e..f42a9eee 100644 --- a/rfbplayer/rfbSessionReader.h +++ b/rfbplayer/rfbSessionReader.h @@ -32,16 +32,14 @@ public: }; ~rfbSessionReader() { - fStop = true; - delete join(); } - void stop() { + virtual Thread* join() { fStop = true; + return Thread::join(); } - void rfbSessionReader::run() { - fStop = false; + virtual void rfbSessionReader::run() { // Process the rfb messages while (!fStop) { try { diff --git a/rfbplayer/rfbplayer.cxx b/rfbplayer/rfbplayer.cxx index 169d7161..af6811b1 100644 --- a/rfbplayer/rfbplayer.cxx +++ b/rfbplayer/rfbplayer.cxx @@ -235,7 +235,6 @@ RfbPlayer::RfbPlayer(char *_fileName, long _initTime = 0, double _playbackSpeed RfbPlayer::~RfbPlayer() { vlog.debug("~RfbPlayer"); if (rfbReader) { - rfbReader->stop(); delete rfbReader->join(); rfbReader = 0; } @@ -820,7 +819,6 @@ void RfbPlayer::openSessionFile(char *_fileName) { // Close the previous reading thread if (rfbReader) { - rfbReader->stop(); delete rfbReader->join(); } blankBuffer(); |