* [gentoo-commits] gentoo-x86 commit in media-sound/amarok/files: amarok-2.6.90-fix-crash-lastfm.patch
@ 2013-01-14 4:27 Jorge Manuel B. S. Vicetto (jmbsvicetto)
0 siblings, 0 replies; 2+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2013-01-14 4:27 UTC (permalink / raw
To: gentoo-commits
jmbsvicetto 13/01/14 04:27:48
Added: amarok-2.6.90-fix-crash-lastfm.patch
Log:
Applied reworked upstream patch by Matěj Laitl to fix a crash on startup related to the lastfm port - fixes bug 451476.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key BB0E6E98)
Revision Changes Path
1.1 media-sound/amarok/files/amarok-2.6.90-fix-crash-lastfm.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.6.90-fix-crash-lastfm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/amarok/files/amarok-2.6.90-fix-crash-lastfm.patch?rev=1.1&content-type=text/plain
Index: amarok-2.6.90-fix-crash-lastfm.patch
===================================================================
commit 68f90970f51015b9410b0786fa4d861089ccd413
Author: Matěj Laitl <matej@laitl.cz>
Date: Sat Dec 15 23:17:45 2012 +0100
ServiceBase::setModel(): prevent crash triggered by Last.fm rewrite
BUGFIXES:
* Prevent crash in ServiceBase::setModel triggered by Last.fm rewrite.
Lukáši, please test the patch so that we have no fear releasing 2.7
final.
BUG: 311723
FIXED-IN: 2.7
diff -urN a/amarok-2.6.90/src/services/ServiceBase.cpp b/amarok-2.6.90/src/services/ServiceBase.cpp
--- a/amarok-2.6.90/src/services/ServiceBase.cpp
+++ b/amarok-2.6.90/src/services/ServiceBase.cpp
@@ -173,10 +173,9 @@ ServiceBase::itemActivated ( const QModelIndex & index )
void
ServiceBase::setModel( QAbstractItemModel * model )
{
- //m_filterModel->setSourceModel( model );
- //m_contentView->setModel( m_filterModel );
- m_contentView->setModel( model );
- m_model = model;
+ if( m_contentView )
+ m_contentView->setModel( model );
+ m_model = model;
}
QAbstractItemModel *
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/amarok/files: amarok-2.6.90-fix-crash-lastfm.patch
@ 2013-01-18 12:48 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 2+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2013-01-18 12:48 UTC (permalink / raw
To: gentoo-commits
scarabeus 13/01/18 12:48:04
Removed: amarok-2.6.90-fix-crash-lastfm.patch
Log:
Version bump to 2.7.0. Wrt Matej request on irc.
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-01-18 12:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-14 4:27 [gentoo-commits] gentoo-x86 commit in media-sound/amarok/files: amarok-2.6.90-fix-crash-lastfm.patch Jorge Manuel B. S. Vicetto (jmbsvicetto)
-- strict thread matches above, loose matches on Subject: below --
2013-01-18 12:48 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox