From f0a298e27b73d33076d6551f042666c02a403103 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 15 Sep 2016 12:51:09 +0300 Subject: [PATCH] Minor: Fix NPE in MoveKotlinTopLevelDeclarationsDialog #KT-13856 Fixed --- .../ui/MoveKotlinTopLevelDeclarationsDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index a80df6f8757..fec9aea6804 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -456,7 +456,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { PsiDirectory selectedPsiDirectory; if (initialTargetDirectory == null) { DirectoryChooser.ItemWrapper selectedItem = (DirectoryChooser.ItemWrapper)destinationFolderCB.getComboBox().getSelectedItem(); - selectedPsiDirectory = selectedItem.getDirectory(); + selectedPsiDirectory = selectedItem != null ? selectedItem.getDirectory() : null; if (selectedPsiDirectory == null) return Pair.create(null, new MultipleRootsMoveDestination(targetPackage)); } else {