diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-04-17 23:40:12 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-04-18 08:41:01 +0200 |
| commit | 95601e7de8e9a0e83fb8ca1111acd20e77a9d96f (patch) | |
| tree | 1f1e8a3b391ad35c278333f441f832f878e54f5f /kicker | |
| parent | 2753b1f15808e23e00cfe73034c4532b1d473578 (diff) | |
| download | tdebase-95601e7de8e9a0e83fb8ca1111acd20e77a9d96f.tar.gz tdebase-95601e7de8e9a0e83fb8ca1111acd20e77a9d96f.zip | |
Fix potential infinite recursion in kicker-3.4-reverseLayout
This resolves Bug 1058
(cherry picked from commit 31733b090de0033648fe57eef33ee54c58f900e9)
Diffstat (limited to 'kicker')
| -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 97a35aff6..47eaa0d84 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; + } } } |