From 005675c5f5cf51818e997d23320994cb3b523577 Mon Sep 17 00:00:00 2001
From: Uwe Stieber
Date: Thu, 23 Feb 2012 08:27:05 +0100
Subject: Target Explorer: Fix SWTException on shutdown

---
 .../src/org/eclipse/tcf/te/tcf/filesystem/activator/UIPlugin.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/src/org/eclipse/tcf/te/tcf/filesystem/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/src/org/eclipse/tcf/te/tcf/filesystem/activator/UIPlugin.java
index a4e465cf6..b33eae758 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/src/org/eclipse/tcf/te/tcf/filesystem/activator/UIPlugin.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.filesystem/src/org/eclipse/tcf/te/tcf/filesystem/activator/UIPlugin.java
@@ -18,6 +18,7 @@ import org.eclipse.core.commands.Command;
 import org.eclipse.core.commands.IExecutionListener;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.SWTException;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.tcf.te.tcf.filesystem.internal.ImageConsts;
 import org.eclipse.tcf.te.tcf.filesystem.internal.autosave.SaveAllListener;
@@ -127,7 +128,8 @@ public class UIPlugin extends AbstractUIPlugin {
 			Command saveAllCmd = commandService.getCommand(IWorkbenchCommandConstants.FILE_SAVE_ALL);
 			saveAllCmd.removeExecutionListener(saveAllListener);
 		}
-		clipboard.dispose();
+		// Ignore SWTException here, the display might be disposed already.
+		try { clipboard.dispose(); } catch (SWTException e) { /* ignored on purpose */ }
 		clipboard = null;
 		plugin = null;
 		super.stop(context);
-- 
cgit v1.2.3