diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 11 |
2 files changed, 14 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2011-05-27 Deepak Bhole <[email protected]> + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (appletClose): Call dispose from the swing thread. Also, don't try to stop + the threadgroup. + +2011-05-27 Deepak Bhole <[email protected]> + * Backed out 0256de6a4bf6 2011-05-27 Omair Majid <[email protected]> diff --git a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java index d974ca9..36bc47a 100644 --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java @@ -1625,10 +1625,15 @@ public class PluginAppletViewer extends XEmbeddedFrame appletShutdown(p); appletPanels.removeElement(p); - dispose(); - if (tg.activeCount() > 0) - tg.stop(); + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + dispose(); + } + }); + } catch (Exception e) { // ignore, we are just disposing it + } if (countApplets() == 0) { appletSystemExit(); |