[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok]  Fix crash with dangling pointer on trying to play
From:       Alejandro Wainzinger <aikawarazuni () gmail ! com>
Date:       2010-01-06 17:12:02
Message-ID: 201001061712.o06HC2Zt017341 () Wurst ! kollide ! net
[Download RAW message or body]

commit ef6bb726b1823b0ee86ddfd6475f0bdba9b5b80c
Author:     Alejandro Wainzinger <aikawarazuni@gmail.com>
AuthorDate: Wed Jan 6 08:57:01 2010 -0800
Commit:     Alejandro Wainzinger <aikawarazuni@gmail.com>
CommitDate: Wed Jan 6 08:59:51 2010 -0800

    Fix crash with dangling pointer on trying to play a media device track whose \
collection no longer exists.  ~lart xevix
    BUG:210477

diff --git a/src/collection/mediadevicecollection/MediaDeviceMeta.h \
b/src/collection/mediadevicecollection/MediaDeviceMeta.h index fa5efed..4541f7e \
                100644
--- a/src/collection/mediadevicecollection/MediaDeviceMeta.h
+++ b/src/collection/mediadevicecollection/MediaDeviceMeta.h
@@ -22,6 +22,7 @@
 #include "mediadevicecollection_export.h"
 
 #include <QList>
+#include <QPointer>
 #include <QMultiMap>
 
 class MediaDeviceCollection;
@@ -145,7 +146,7 @@ class MEDIADEVICECOLLECTION_EXPORT MediaDeviceTrack : public \
Meta::Track  void setPlayableUrl( const KUrl &url) { m_playableUrl = url; }
 
     private:
-        MediaDeviceCollection *m_collection;
+        QPointer<MediaDeviceCollection> m_collection;
 
         MediaDeviceArtistPtr m_artist;
         MediaDeviceAlbumPtr m_album;


[prev in list] [next in list] [prev in thread] [next in thread]