diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-17 23:40:12 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-17 23:40:12 -0500 |
| commit | 31733b090de0033648fe57eef33ee54c58f900e9 (patch) | |
| tree | ed867046ae1d1a4bcdf58b8ea28c9483bfa96416 | |
| parent | 6342dc39907a647a0fd9f84b3ba143cef4792877 (diff) | |
| download | tdebase-31733b090de0033648fe57eef33ee54c58f900e9.tar.gz tdebase-31733b090de0033648fe57eef33ee54c58f900e9.zip | |
Fix potential infinite recursion in kicker-3.4-reverseLayout
This resolves Bug 1058
| -rw-r--r-- | kicker/kicker/kicker-3.4-reverseLayout.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index 6112d4b38..9d530f236 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -124,7 +124,11 @@ int main(int argc, char** argv) { if (it2.data().desktopFile == "childpanelextension.desktop") { - childPanelConfigFiles << it2.data().configFile; + // Prevent infinite recursion + if (it2.data().configFile != "kickerrc") + { + childPanelConfigFiles << it2.data().configFile; + } } } |