[Esbox-commits] r1546 - branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard

[eswartz at garage.maemo.org]

Author: eswartz
Date: 2009-05-07 03:39:40 +0300 (Thu, 07 May 2009)
New Revision: 1546

Modified:
   branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java
Log:
Avoid NPE before launching Nokia Binaries installer (the real fix was in BaseSDK#equals, but be extra-vigilant)

Modified: branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java
===================================================================
--- branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java	2009-05-06 22:41:06 UTC (rev 1545)
+++ branches/work_Ed/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java	2009-05-07 00:39:40 UTC (rev 1546)
@@ -178,7 +178,7 @@
 
 			public void selectionChanged(SelectionChangedEvent event) {
 				sdk = ((IScratchbox1SDK) ((IStructuredSelection) event.getSelection()).getFirstElement());
-				if (targetInstallerData != null)
+				if (targetInstallerData != null && sdk != null)
 					targetInstallerData.setScratchbox1SDK(sdk);
 				validatePage();
 			}
@@ -449,6 +449,8 @@
 			setErrorMessage("A platform must be selected");
 			return;
 		}
+		targetInstallerData.setScratchbox1SDK(sdk);
+		
 		IFileStore sboxRoot = buildMachine.getFileSystemAccess().getFileStore(
 				new Path(targetInstallerData.getScratchboxLocation()));
 		if (!sboxRoot.fetchInfo().exists()) {