mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

Avoid crash when propagating dbcmd_ShareTrack.

Browse Source
This commit is contained in:
Teo Mrnjavac
2013-05-24 18:30:01 +02:00
parent bd197f40de
commit cab5965605
3 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libtomahawk/database/DatabaseCommand_ShareTrack.cpp
View File

@@ -73,11 +73,16 @@ DatabaseCommand_ShareTrack::postCommitHook()
QString myDbid = SourceList::instance()->getLocal()->nodeId();
QString sourceDbid = source()->nodeId();
if ( source()->isLocal() || sourceDbid != m_recipient ) //if I just sent a track
qRegisterMetaType< InboxJobItem::Side >("InboxJobItem::Side");
qRegisterMetaType< Tomahawk::trackdata_ptr >("Tomahawk::trackdata_ptr");
if ( source()->isLocal() && sourceDbid != m_recipient ) //if I just sent a track
{
JobStatusView::instance()->model()->addJob( new InboxJobItem( InboxJobItem::Sending,
SourceList::instance()->get( m_recipient )->friendlyName(),
m_track ) );
QMetaObject::invokeMethod( ViewManager::instance()->inboxModel(),
"showNotification",
Qt::QueuedConnection,
Q_ARG( InboxJobItem::Side, InboxJobItem::Sending ),
Q_ARG( const QString&, m_recipient ),
Q_ARG( const Tomahawk::trackdata_ptr&, m_track ) );
}
if ( m_track )
@@ -107,11 +112,15 @@ DatabaseCommand_ShareTrack::postCommitHook()
Q_ARG( const Tomahawk::query_ptr&, m_track->toQuery() ),
Q_ARG( int, 0 ) /*row*/ );
QString friendlyName = source()->friendlyName();
if ( ViewManager::instance()->currentPage() != ViewManager::instance()->inboxWidget() )
JobStatusView::instance()->model()->addJob( new InboxJobItem( InboxJobItem::Receiving,
friendlyName,
m_track ) );
{
QMetaObject::invokeMethod( ViewManager::instance()->inboxModel(),
"showNotification",
Qt::QueuedConnection,
Q_ARG( InboxJobItem::Side, InboxJobItem::Receiving ),
Q_ARG( const Tomahawk::source_ptr&, source() ),
Q_ARG( const Tomahawk::trackdata_ptr&, m_track ) );
}
}

23
src/libtomahawk/playlist/InboxModel.cpp
View File

@@ -25,6 +25,7 @@
#include "SourceList.h"
#include "utils/Logger.h"
#include "utils/Closure.h"
#include "jobview/JobStatusModel.h"
InboxModel::InboxModel( QObject* parent )
@@ -129,6 +130,28 @@ InboxModel::clear()
}
void
InboxModel::showNotification( InboxJobItem::Side side,
const Tomahawk::source_ptr& src,
const Tomahawk::trackdata_ptr& track )
{
JobStatusView::instance()->model()->addJob( new InboxJobItem( side,
src->friendlyName(),
track ) );
}
void
InboxModel::showNotification( InboxJobItem::Side side,
const QString& dbid,
const Tomahawk::trackdata_ptr& track )
{
Tomahawk::source_ptr src = SourceList::instance()->get( dbid );
if ( !src.isNull() )
showNotification( side, src, track );
}
void
InboxModel::loadTracks()
{

9
src/libtomahawk/playlist/InboxModel.h
View File

@@ -22,6 +22,7 @@
#include "PlaylistModel.h"
#include "Typedefs.h"
#include "DllMacro.h"
#include "jobview/InboxJobItem.h"
class DLLEXPORT InboxModel : public PlaylistModel
@@ -45,6 +46,14 @@ public slots:
virtual void clear();
virtual void showNotification( InboxJobItem::Side side,
const Tomahawk::source_ptr& src,
const Tomahawk::trackdata_ptr& track ); //for lack of a better place to put this
virtual void showNotification( InboxJobItem::Side side,
const QString& dbid,
const Tomahawk::trackdata_ptr& track );
private slots:
void loadTracks();