[Esbox-commits] r1238 - trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-02-18 18:12:50 +0200 (Wed, 18 Feb 2009)
New Revision: 1238

Modified:
   trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
Log:
Merge rev Fix bug 1237 from work_Ed branch

Modified: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java	2009-02-18 15:23:12 UTC (rev 1237)
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/MaemoScriptLauncher.java	2009-02-18 16:12:50 UTC (rev 1238)
@@ -61,11 +61,12 @@
 	 * Method that stop X-environment for Scratchbox
 	 */
 	public void stopX(ISDKTarget sdkTarget) throws MicaException {
-		IMaemoLauncherAdapter launcher = (IMaemoLauncherAdapter)sdkTarget.getAdapter(IMaemoLauncherAdapter.class);
-		
-		if (launcher!=null && sdkTarget != null && launcher.isMaemoRunning())
-			throw new MicaException("Maemo is still running. Stop Maemo first");
-
+		if (sdkTarget != null) {
+			IMaemoLauncherAdapter launcher = (IMaemoLauncherAdapter)sdkTarget.getAdapter(IMaemoLauncherAdapter.class);
+			
+			if (launcher != null && launcher.isMaemoRunning())
+				throw new MicaException("Maemo is still running.  Stop Maemo first.");
+		}
 		XLauncher.getInstance().stopX(CorePreferenceManager.getInstance().getPreferenceProvider());
 	}