[ jEdit-commits ] SF.net SVN: jedit:[20282] plugins/Console/trunk/console

[<ez...@us...>]

Revision: 20282
          http://jedit.svn.sourceforge.net/jedit/?rev=20282&view=rev
Author:   ezust
Date:     2011-11-10 20:31:29 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Making console shutdown more cleanly. 

Modified Paths:
--------------
    plugins/Console/trunk/console/ConsolePlugin.java
    plugins/Console/trunk/console/ProjectTreeListener.java

Modified: plugins/Console/trunk/console/ConsolePlugin.java
===================================================================
--- plugins/Console/trunk/console/ConsolePlugin.java	2011-11-10 20:05:38 UTC (rev 20281)
+++ plugins/Console/trunk/console/ConsolePlugin.java	2011-11-10 20:31:29 UTC (rev 20282)
@@ -182,9 +182,9 @@
 		}
 		if (vmsg.getWhat() == ViewUpdate.CLOSED) {
 			View v = vmsg.getView();
+			Console c = getConsole(v);
+			if (c != null) c.unload();
 			CommandoToolBar.remove(v);
-			Console c = getConsole(v);
-			c.unload();
 		}
 	}
 	// }}}

Modified: plugins/Console/trunk/console/ProjectTreeListener.java
===================================================================
--- plugins/Console/trunk/console/ProjectTreeListener.java	2011-11-10 20:05:38 UTC (rev 20281)
+++ plugins/Console/trunk/console/ProjectTreeListener.java	2011-11-10 20:31:29 UTC (rev 20282)
@@ -74,8 +74,9 @@
 			return;
 		if (!(msg.getClass().getName().endsWith("ViewerUpdate"))) return;
 		final ViewerUpdate vu = (ViewerUpdate) msg;
+		if (vu.getType() != ViewerUpdate.Type.PROJECT_LOADED) return;
+		if (console == null) return;
 		if (vu.getView() != console.getView()) return;
-		if (vu.getType() != ViewerUpdate.Type.PROJECT_LOADED) return;
 		new Thread()
 		{
 			public void run()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.