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

[topulkki at garage.maemo.org]

Author: topulkki
Date: 2009-09-21 14:29:28 +0300 (Mon, 21 Sep 2009)
New Revision: 2206

Modified:
   trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java
Log:
Updates the first bug fix for #4535.

Modified: trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java
===================================================================
--- trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java	2009-09-21 09:32:42 UTC (rev 2205)
+++ trunk/org.maemo.esbox.maemosdk.core/src/org/maemo/esbox/internal/api/maemosdk/core/tools/XLauncher.java	2009-09-21 11:29:28 UTC (rev 2206)
@@ -470,8 +470,8 @@
 		for (IProcess process : processes) {
 			try {		
 				process.terminate();
-				// wait a while and check is X stopped 
-				do {				
+				// check is X successfully stopped		
+				while(isXServerStarted(prefProvider)){
 					try {
 						Thread.sleep(500);
 					} catch (InterruptedException e) {
@@ -480,7 +480,7 @@
 					if (monitor.isCanceled()) {
 						throw new OperationCanceledException();
 					}
-				} while (isXServerStarted(prefProvider));
+				}
 			} catch (IOException e) {
 				throw new MicaException("Error killing " + executable, e);
 			}