[rpms/amarok] epel10.2: - playlist_default_layout_fix.diff (kde#211717)

[rpms/amarok] epel10.2: - playlist_default_layout_fix.diff (kde#211717)

[Rex Dieter]

A new commit has been pushed.

Repo   : rpms/amarok
Branch : epel10.2
Commit : 06f6ebcb9c859e87eda157ef451668383ea9fbe4
Author : Rex Dieter <rdieter@fedoraproject.org>
Date   : 2009-11-16T14:49:49+00:00
Stats  : +36/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/amarok/c/06f6ebcb9c859e87eda157ef451668383ea9fbe4?branch=epel10.2

Log:
- playlist_default_layout_fix.diff (kde#211717)

---
diff --git a/amarok.spec b/amarok.spec
index b2d9778..55439cf 100644
--- a/amarok.spec
+++ b/amarok.spec
@@ -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}-%{release}-root-%(%{__id_u} -n)
 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@fedoraproject.org. 2.2.1-1
+* Mon Nov 16 2009 Rex Dieter <rdieter@fedoraproject.org> 2.2.1-2
+- playlist_default_layout_fix.diff (kde#211717)
+
+* Wed Nov 11 2009 Rex Dieter <rdieter@fedoraproject.org> 2.2.1-1
 - amarok-2.2.1
 
 * Thu Oct 08 2009 Rex Dieter <rdieter@fedoraproject.org> 2.2.0-3

diff --git a/playlist_default_layout_fix.diff b/playlist_default_layout_fix.diff
new file mode 100644
index 0000000..106f659
--- /dev/null
+++ b/playlist_default_layout_fix.diff
@@ -0,0 +1,29 @@
+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();
+ }