rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

GCS UAVGadgetManager: Minor bugfix, wasn't always deleting oldstyle

Browse Source 
subgroups, which would cause them to be loaded.


git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1693 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
cranphin 2010-09-19 19:16:01 +00:00 committed by cranphin
parent 5c848d4944
commit 318a60e05e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ground/src/plugins/coreplugin/uavgadgetmanager/uavgadgetmanager.cpp
View File

@ -497,10 +497,13 @@ void UAVGadgetManager::saveSettings(QSettings *qs)
// remove them for now. Since we no longer have two // remove them for now. Since we no longer have two
// possible groups, we can remove the non default one too. // possible groups, we can remove the non default one too.
// TODO: Remove this code, and support for reading default group. // TODO: Remove this code, and support for reading default group.
if (qs->childGroups().contains(defaultUAVGadgetManagerKey)) { if (qs->childKeys().contains(defaultUAVGadgetManagerKey) ||
qs->childGroups().contains(defaultUAVGadgetManagerKey)) {
qs->remove(defaultUAVGadgetManagerKey); qs->remove(defaultUAVGadgetManagerKey);
} }
if (qs->childGroups().contains(uavGadgetManagerKey)) {
if (qs->allKeys().contains(uavGadgetManagerKey) ||
qs->childGroups().contains(uavGadgetManagerKey)) {
qs->remove(uavGadgetManagerKey); qs->remove(uavGadgetManagerKey);
} }