Fix RfbPlayer so that it shuts down more orderly. prevents a
crash with certain jvm versions under Win IE.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2538 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/java/src/com/tightvnc/rfbplayer/RfbPlayer.java b/java/src/com/tightvnc/rfbplayer/RfbPlayer.java
index 4b74889..490b2bc 100644
--- a/java/src/com/tightvnc/rfbplayer/RfbPlayer.java
+++ b/java/src/com/tightvnc/rfbplayer/RfbPlayer.java
@@ -68,6 +68,7 @@
double playbackSpeed;
boolean autoPlay;
boolean showControls;
+ boolean isQuitting = false;
int deferScreenUpdates;
//
@@ -93,7 +94,7 @@
if (inSeparateFrame)
vncFrame.addWindowListener(this);
- rfbThread = new Thread(this);
+ rfbThread = new Thread(this, "RfbThread");
rfbThread.start();
}
@@ -170,7 +171,7 @@
vc.resizeEmbeddedApplet();
}
- while (true) {
+ while (!isQuitting) {
try {
setPaused(!autoPlay);
rfb.fbs.setSpeed(playbackSpeed);
@@ -378,9 +379,14 @@
// This method is called before the applet is destroyed.
//
public void destroy() {
+ isQuitting = true;
vncContainer.removeAll();
if (rfb != null) {
- rfb = null;
+ rfb.quit();
+ }
+ try {
+ rfbThread.join();
+ } catch (InterruptedException e) {
}
if (inSeparateFrame) {
vncFrame.dispose();