Fixed NPE (PY-22827)

This commit is contained in:
Andrey Vlasovskikh
2017-02-22 16:59:46 +03:00
parent b3a6f1a329
commit a6d0d7bea5
@@ -252,15 +252,17 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
Sdk selectedSdk = getSelectedSdk();
if (selectedSdk instanceof PyDetectedSdk) {
final String sdkName = selectedSdk.getName();
VirtualFile sdkHome = ApplicationManager.getApplication().runWriteAction(new Computable<VirtualFile>() {
final VirtualFile sdkHome = ApplicationManager.getApplication().runWriteAction(new Computable<VirtualFile>() {
@Override
public VirtualFile compute() {
return LocalFileSystem.getInstance().refreshAndFindFileByPath(sdkName);
}
});
selectedSdk = SdkConfigurationUtil.createAndAddSDK(sdkHome.getPath(), PythonSdkType.getInstance());
if (selectedSdk != null) {
myProjectSdksModel.addSdk(selectedSdk);
if (sdkHome != null) {
selectedSdk = SdkConfigurationUtil.createAndAddSDK(sdkHome.getPath(), PythonSdkType.getInstance());
if (selectedSdk != null) {
myProjectSdksModel.addSdk(selectedSdk);
}
}
}
else if (myInitialSdkSet.contains(selectedSdk) && selectedSdk != null) {