From 31733b090de0033648fe57eef33ee54c58f900e9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 17 Apr 2013 23:40:12 -0500 Subject: [PATCH] Fix potential infinite recursion in kicker-3.4-reverseLayout This resolves Bug 1058 --- kicker/kicker/kicker-3.4-reverseLayout.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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; + } } }