EA-44865 - NPE: DestinationFolderComboBox.selectDirectory

(cherry picked from commit 3e5b60a3dd56199e780149e1f1a3f77507b8a085)
This commit is contained in:
anna
2013-03-21 10:40:38 +01:00
parent 0d417784c8
commit e8822476d7
@@ -167,7 +167,7 @@ public abstract class DestinationFolderComboBox extends ComboboxWithBrowseButton
final PsiDirectory selectedPsiDirectory = selectedItem.getDirectory();
VirtualFile selectedDestination = selectedPsiDirectory.getVirtualFile();
if (showChooserWhenDefault &&
Comparing.equal(selectedDestination, myInitialTargetDirectory.getVirtualFile()) &&
myInitialTargetDirectory != null && Comparing.equal(selectedDestination, myInitialTargetDirectory.getVirtualFile()) &&
mySourceRoots.length > 1) {
selectedDestination = MoveClassesOrPackagesUtil.chooseSourceRoot(targetPackage, mySourceRoots, myInitialTargetDirectory);
}