EA-42487 - NPE: IdeaProjectSettingsService.openModuleSettings

coderfly · Jan 28, 2013 · 2d6033f · 2d6033f
1 parent 45964ee
commit 2d6033f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/AbstractModuleNode.java
@@ -94,7 +94,10 @@ public String getToolTip() {
 
   @Override
   public void navigate(final boolean requestFocus) {
-    ProjectSettingsService.getInstance(myProject).openModuleSettings(getValue());
+    Module module = getValue();
+    if (module != null) {
+      ProjectSettingsService.getInstance(myProject).openModuleSettings(module);
+    }
   }
 
   @Override
@@ -104,6 +107,6 @@ public String getNavigateActionText(boolean focusEditor) {
 
   @Override
   public boolean canNavigate() {
-    return ProjectSettingsService.getInstance(myProject).canOpenModuleSettings();
+    return ProjectSettingsService.getInstance(myProject).canOpenModuleSettings() && getValue() != null;
   }
 }