rpms/amarok/F-11 playlist_default_layout_fix.diff,NONE,1.1

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2567/F-11

Added Files:
	playlist_default_layout_fix.diff 
Log Message:
* Wed Nov 11 2009 Rex Dieter <rdieter at fedoraproject.org. 2.2.1-1
- amarok-2.2.1


playlist_default_layout_fix.diff:
 LayoutManager.cpp            |    2 ++
 PlaylistLayoutEditDialog.cpp |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE playlist_default_layout_fix.diff ---
diff --git a/src/playlist/layouts/LayoutManager.cpp b/src/playlist/layouts/LayoutManager.cpp
index b2903ee..541f989 100644
--- a/src/playlist/layouts/LayoutManager.cpp
+++ b/src/playlist/layouts/LayoutManager.cpp
@@ -55,6 +55,8 @@ LayoutManager::LayoutManager()
 
     KConfigGroup config = Amarok::config("Playlist Layout");
     m_activeLayout = config.readEntry( "CurrentLayout", "Default" );
+    if( !layouts().contains( m_activeLayout ) )
+        m_activeLayout = "Default";
     Playlist::ModelStack::instance()->top()->setGroupingCategory( activeLayout().groupBy() );
 }
 
diff --git a/src/playlist/layouts/PlaylistLayoutEditDialog.cpp b/src/playlist/layouts/PlaylistLayoutEditDialog.cpp
index 166879c..03fd529 100644
--- a/src/playlist/layouts/PlaylistLayoutEditDialog.cpp
+++ b/src/playlist/layouts/PlaylistLayoutEditDialog.cpp
@@ -440,7 +440,10 @@ void PlaylistLayoutEditDialog::reject()     //SLOT
     DEBUG_BLOCK
 
     debug() << "Applying initial layout: " << m_firstActiveLayout;
-    LayoutManager::instance()->setActiveLayout( m_firstActiveLayout );
+    if( layoutListWidget->findItems( m_firstActiveLayout, Qt::MatchExactly ).isEmpty() )
+        LayoutManager::instance()->setActiveLayout( "Default" );
+    else
+        LayoutManager::instance()->setActiveLayout( m_firstActiveLayout );
 
     QDialog::reject();
 }