From 434af181a1016e6bea2e1d6fc9dfcdd08f72da0d Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 8 Aug 2011 07:55:25 +0000 Subject: Fix kdelibs startup failure git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1245665 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kinit/autostart.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'kinit') diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp index d6a10e537..9383e4301 100644 --- a/kinit/autostart.cpp +++ b/kinit/autostart.cpp @@ -178,23 +178,12 @@ AutoStart::loadAutoStartList() if (config.hasKey("OnlyShowIn")) { - if (!config.readListEntry("OnlyShowIn", ';').tqcontains("TDE")) + if ((!config.readListEntry("OnlyShowIn", ';').tqcontains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))) continue; } if (config.hasKey("NotShowIn")) { - if (config.readListEntry("NotShowIn", ';').tqcontains("TDE")) - continue; - } - - if (config.hasKey("OnlyShowIn")) - { - if (!config.readListEntry("OnlyShowIn", ';').tqcontains("KDE")) - continue; - } - if (config.hasKey("NotShowIn")) - { - if (config.readListEntry("NotShowIn", ';').tqcontains("KDE")) + if ((config.readListEntry("NotShowIn", ';').tqcontains("TDE")) || (config.readListEntry("NotShowIn", ';').tqcontains("KDE"))) continue; } -- cgit v1.2.1