From 8b19de13f07ef8df5dfb1b8683b4b6e878e38cb5 Mon Sep 17 00:00:00 2001 From: Lucas Murray Date: Sat, 29 Aug 2009 10:16:13 +0000 Subject: [PATCH] Select the default decoration if the configured decoration doesn't exist. svn path=/trunk/KDE/kdebase/workspace/; revision=1016905 --- kcmkwin/kwindecoration/kwindecoration.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index f03f6e4db5..4f810c41fc 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -446,6 +446,12 @@ void KWinDecorationModule::readConfig( const KConfigGroup & conf ) ((QPixmap::defaultDepth() > 8) ? "kwin3_nitrogen" : "kwin3_plastik")); QString decoName = decorationName( currentLibraryName ); + if (decoName.isEmpty()) + { // Selected decoration doesn't exist, use the default + currentLibraryName = ((QPixmap::defaultDepth() > 8) ? "kwin3_nitrogen" : "kwin3_plastik"); + decoName = decorationName( currentLibraryName ); + } + // If we are using the "default" kde client, use the "default" entry. // if (decoName.isEmpty()) // decoName = i18n("KDE 2");