[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kde-workspace/KDE/4.10] kmenuedit: Fix crash when doing stuff like kmenuedit Games/Arcade
From: Albert Astals Cid <aacid () kde ! org>
Date: 2013-02-28 23:30:02
Message-ID: 20130228233002.23E1CA604F () git ! kde ! org
[Download RAW message or body]
Git commit 7f220f427f998825327d9b88514e19ea75fb32da by Albert Astals Cid, on behalf of Julien Borderie.
Committed on 01/03/2013 at 00:29.
Pushed by aacid into branch 'KDE/4.10'.
Fix crash when doing stuff like kmenuedit Games/Arcade
Not very smart to shadow the variables :D
Part of review 109084
M +5 -5 kmenuedit/treeview.cpp
http://commits.kde.org/kde-workspace/7f220f427f998825327d9b88514e19ea75fb32da
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index b144b1c..a6e968a 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -463,18 +463,18 @@ TreeItem *TreeView::expandPath(TreeItem *item, const QString &path)
QString restMenu = path.mid(i+1);
for (int i = 0; i < item->childCount(); ++i) {
- TreeItem *item = dynamic_cast<TreeItem *>(item->child(i));
- if (!item) {
+ TreeItem *childItem = dynamic_cast<TreeItem *>(item->child(i));
+ if (!childItem) {
continue;
}
- MenuFolderInfo *folderInfo = item->folderInfo();
+ MenuFolderInfo *folderInfo = childItem->folderInfo();
if (folderInfo && (folderInfo->id == subMenu)) {
- item->setExpanded(true);
+ childItem->setExpanded(true);
if (!restMenu.isEmpty()) {
return expandPath(item, restMenu);
} else {
- return item;
+ return childItem;
}
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic