diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-30 16:55:04 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2007-08-30 16:55:04 +0000 |
commit | 50af4dc0891385ad0ff7ae8ad9713f89b4014466 (patch) | |
tree | bfe5667c3ed013e21c6401195c153ac7652791ad /rbutil | |
parent | 189de39258822f4976e71b5576280ba4ef937dab (diff) | |
download | rockbox-50af4dc0891385ad0ff7ae8ad9713f89b4014466.tar.gz rockbox-50af4dc0891385ad0ff7ae8ad9713f89b4014466.zip |
When autodetecting, don't segfault if no item was previously selected and a device is found.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14533 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/configure.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp index 05d0352498..49fa82f993 100644 --- a/rbutil/rbutilqt/configure.cpp +++ b/rbutil/rbutilqt/configure.cpp | |||
@@ -517,13 +517,16 @@ void Config::autodetect() | |||
517 | if(detector.detect()) //let it detect | 517 | if(detector.detect()) //let it detect |
518 | { | 518 | { |
519 | QString devicename = detector.getDevice(); | 519 | QString devicename = detector.getDevice(); |
520 | //deexpand the platform | 520 | |
521 | ui.treeDevices->selectedItems().at(0)->parent()->setExpanded(false); | 521 | if(ui.treeDevices->selectedItems().size() > 0) { |
522 | //deselect the selected item | 522 | // deexpand the platform |
523 | ui.treeDevices->selectedItems().at(0)->setSelected(false); | 523 | ui.treeDevices->selectedItems().at(0)->parent()->setExpanded(false); |
524 | //deselect the selected item | ||
525 | ui.treeDevices->selectedItems().at(0)->setSelected(false); | ||
526 | } | ||
524 | 527 | ||
525 | // find the new item | 528 | // find the new item |
526 | //enumerate al plattform items | 529 | // enumerate all platform items |
527 | QList<QTreeWidgetItem*> itmList= ui.treeDevices->findItems("*",Qt::MatchWildcard); | 530 | QList<QTreeWidgetItem*> itmList= ui.treeDevices->findItems("*",Qt::MatchWildcard); |
528 | for(int i=0; i< itmList.size();i++) | 531 | for(int i=0; i< itmList.size();i++) |
529 | { | 532 | { |
@@ -532,7 +535,7 @@ void Config::autodetect() | |||
532 | { | 535 | { |
533 | QString data = itmList.at(i)->child(j)->data(0, Qt::UserRole).toString(); | 536 | QString data = itmList.at(i)->child(j)->data(0, Qt::UserRole).toString(); |
534 | 537 | ||
535 | if( devicename.contains(data)) //item found | 538 | if(devicename == data) // item found |
536 | { | 539 | { |
537 | itmList.at(i)->child(j)->setSelected(true); //select the item | 540 | itmList.at(i)->child(j)->setSelected(true); //select the item |
538 | itmList.at(i)->setExpanded(true); //expand the platform item | 541 | itmList.at(i)->setExpanded(true); //expand the platform item |