summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker')
-rw-r--r--kicker/kicker/kicker-3.4-reverseLayout.cpp6
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;
+ }
}
}