rpms/amarok/devel playlist_default_layout_fix.diff, NONE, 1.1 amarok.spec, 1.173, 1.174

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/amarok/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22505

Modified Files:
	amarok.spec 
Added Files:
	playlist_default_layout_fix.diff 
Log Message:
* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.1-2
- playlist_default_layout_fix.diff (kde#211717)


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();
 }


Index: amarok.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -p -r1.173 -r1.174
--- amarok.spec	12 Nov 2009 13:40:33 -0000	1.173
+++ amarok.spec	16 Nov 2009 14:49:48 -0000	1.174
@@ -2,7 +2,7 @@
 Name:    amarok
 Summary: Media player
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group: 	 Applications/Multimedia
 License: GPLv2+
@@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch50: amarok-2.0.90-qtscript_not_required.patch
 
 ## upstream patches
+Patch100: playlist_default_layout_fix.diff
 
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
@@ -82,6 +83,7 @@ Obsoletes: amarok-utilities < 2.0.96
 %setup -q 
 
 %patch50 -p1 -b .qtscript_not_required
+%patch100 -p1 -b .playlist_default_layout_fix
 
 
 %build
@@ -173,7 +175,10 @@ fi
 
 
 %changelog
-* Wed Nov 11 2009 Rex Dieter <rdieter at fedoraproject.org. 2.2.1-1
+* Mon Nov 16 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.1-2
+- playlist_default_layout_fix.diff (kde#211717)
+
+* Wed Nov 11 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.1-1
 - amarok-2.2.1
 
 * Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-3