Bugfix, closes #341

de-jcup · Apr 6, 2018 · 83ebc0a · 83ebc0a
1 parent f072a2b
commit 83ebc0a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...src/main/java-eclipse/de/jcup/egradle/eclipse/ide/handlers/QuickTaskExecutionHandler.java b/...src/main/java-eclipse/de/jcup/egradle/eclipse/ide/handlers/QuickTaskExecutionHandler.java
@@ -48,6 +48,9 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		lastInput = null;
 		Shell shell = HandlerUtil.getActiveShellChecked(event);
 		GradleRootProject rootProject = IDEUtil.getRootProject();
+		if (rootProject == null){
+			return null;
+		}
 		QuickLaunchDialog dialog = new QuickLaunchDialog(shell, history, " (" + rootProject.getName() + ")");
 		dialog.open();
 		lastInput = dialog.getValue();

diff --git a/...eclipse/de/jcup/egradle/eclipse/ide/handlers/UpdateOrCreateVirtualRootProjectHandler.java b/...eclipse/de/jcup/egradle/eclipse/ide/handlers/UpdateOrCreateVirtualRootProjectHandler.java
@@ -71,21 +71,23 @@ public void run() {
 
 	@Override
 	public void updateElement(UIElement element, @SuppressWarnings("rawtypes") Map parameters) {
-		GradleRootProject rootProject = IDEUtil.getRootProject();
+		GradleRootProject rootProject = IDEUtil.getRootProject(false);
 		if (rootProject == null) {
 			element.setTooltip("Disabled because currently no egradle root project set!");
 			this.setBaseEnabled(false);
-		} else
+			return;
+		}
 
-		if (!rootProject.isMultiProject()) {
-			element.setTooltip("Disabled because a virtual rooot project is not necessary for single project '"
-					+ rootProject.getName() + "'");
-			this.setBaseEnabled(false);
-		} else {
+		if (rootProject.isMultiProject()) {
 			element.setTooltip("Creates or updates virtual root project for your gradle multi project '"
 					+ rootProject.getName() + "'");
 			this.setBaseEnabled(true);
+			return;
 		}
+
+		element.setTooltip("Disabled because a virtual rooot project is not necessary for single project '"
+				+ rootProject.getName() + "'");
+		this.setBaseEnabled(false);
 	}
 
 	public static void requestRefresh() {