summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBoris Barbulovski <bbarbulovski@gmail.com>2015-09-22 11:36:28 -0700
committerMichal Marek <mmarek@suse.com>2015-11-02 21:43:58 +0100
commitbe596aaa74090f553c61505ad03bb7a7460e5d23 (patch)
treec3505d62f03f413f9da45d82f85d2b7ac2113c3c /scripts
parent588446a84776cfb3ebbc1677c3407d6884878bd6 (diff)
downloadlinux-next-be596aaa74090f553c61505ad03bb7a7460e5d23.tar.gz
Add current selection check.
Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> [mmarek: I missed it in the original Qt5 patch set, which caused a crash] Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/qconf.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 73ce56a76271..91b7e6fbc364 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -400,6 +400,9 @@ void ConfigList::updateSelection(void)
struct menu *menu;
enum prop_type type;
+ if (selectedItems().count() == 0)
+ return;
+
ConfigItem* item = (ConfigItem*)selectedItems().first();
if (!item)
return;
@@ -1624,6 +1627,10 @@ void ConfigMainWindow::goBack(void)
configList->setParentMenu();
if (configList->rootEntry == &rootmenu)
backAction->setEnabled(false);
+
+ if (menuList->selectedItems().count() == 0)
+ return;
+
item = (ConfigItem*)menuList->selectedItems().first();
oldSelection = item;
while (item) {