From 5716ef2bf4c8833c635f568089a62226eb43a694 Mon Sep 17 00:00:00 2001
From: Elizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Date: Thu, 11 May 2017 15:35:54 +0300
Subject: [PATCH] Fixes after review IDEA-CR-20862 (PY-24114)

---
 .../jetbrains/python/debugger/PyDebuggerConfigurable.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/python/src/com/jetbrains/python/debugger/PyDebuggerConfigurable.java b/python/src/com/jetbrains/python/debugger/PyDebuggerConfigurable.java
index b6fae30ba87a..ed5c785cc935 100644
--- a/python/src/com/jetbrains/python/debugger/PyDebuggerConfigurable.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebuggerConfigurable.java
@@ -15,6 +15,7 @@
  */
 package com.jetbrains.python.debugger;
 
+import com.google.common.collect.Lists;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeTooltipManager;
 import com.intellij.openapi.options.Configurable;
@@ -32,8 +33,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import static com.jetbrains.python.debugger.PyDebugSupportUtils.DEBUGGER_WARNING_MESSAGE;
@@ -51,7 +50,7 @@ public class PyDebuggerConfigurable implements SearchableConfigurable, Configura
   private JBCheckBox mySupportQt;
   private JBLabel warningIcon;
   private ComboBox<String> myPyQtBackend;
-  private List<String> myPyQtBackendsList = new ArrayList<>(Arrays.asList("Auto", "PyQt4", "PyQt5", "PySide"));
+  private List<String> myPyQtBackendsList = Lists.newArrayList("Auto", "PyQt4", "PyQt5", "PySide");
 
   private final Project myProject;
 
@@ -96,7 +95,7 @@ public class PyDebuggerConfigurable implements SearchableConfigurable, Configura
            mySaveSignatures.isSelected() != mySettings.isSaveCallSignatures() ||
            mySupportGevent.isSelected() != mySettings.isSupportGeventDebugging() ||
            mySupportQt.isSelected() != mySettings.isSupportQtDebugging() ||
-           !myPyQtBackend.getSelectedItem().equals(mySettings.getPyQtBackend());
+           (myPyQtBackend.getSelectedItem() != null && !myPyQtBackend.getSelectedItem().equals(mySettings.getPyQtBackend()));
   }
 
   public void apply() throws ConfigurationException {