aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/qconf.cc
diff options
context:
space:
mode:
authorBoris Barbulovski <bbarbulovski@gmail.com>2015-09-22 14:36:28 -0400
committerMichal Marek <mmarek@suse.com>2015-11-02 15:43:58 -0500
commitbe596aaa74090f553c61505ad03bb7a7460e5d23 (patch)
treec3505d62f03f413f9da45d82f85d2b7ac2113c3c /scripts/kconfig/qconf.cc
parent588446a84776cfb3ebbc1677c3407d6884878bd6 (diff)
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/kconfig/qconf.cc')
-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)
400 struct menu *menu; 400 struct menu *menu;
401 enum prop_type type; 401 enum prop_type type;
402 402
403 if (selectedItems().count() == 0)
404 return;
405
403 ConfigItem* item = (ConfigItem*)selectedItems().first(); 406 ConfigItem* item = (ConfigItem*)selectedItems().first();
404 if (!item) 407 if (!item)
405 return; 408 return;
@@ -1624,6 +1627,10 @@ void ConfigMainWindow::goBack(void)
1624 configList->setParentMenu(); 1627 configList->setParentMenu();
1625 if (configList->rootEntry == &rootmenu) 1628 if (configList->rootEntry == &rootmenu)
1626 backAction->setEnabled(false); 1629 backAction->setEnabled(false);
1630
1631 if (menuList->selectedItems().count() == 0)
1632 return;
1633
1627 item = (ConfigItem*)menuList->selectedItems().first(); 1634 item = (ConfigItem*)menuList->selectedItems().first();
1628 oldSelection = item; 1635 oldSelection = item;
1629 while (item) { 1636 while (item) {