fixed crash when removing TCO via context-menu

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@780 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-03-08 20:20:06 +00:00
parent ecd46173b7
commit b9f467cd97
2 changed files with 13 additions and 5 deletions

View File

@@ -161,6 +161,7 @@ public:
public slots:
virtual bool close( void );
void remove( void );
protected:

View File

@@ -262,6 +262,16 @@ bool trackContentObjectView::close( void )
void trackContentObjectView::remove( void )
{
// delete ourself
m_trackView->getTrackContentWidget()->removeTCOView( this );
m_tco->deleteLater();
}
void trackContentObjectView::updateLength( void )
{
if( fixedTCOs() )
@@ -426,10 +436,7 @@ void trackContentObjectView::mousePressEvent( QMouseEvent * _me )
}
else if( fixedTCOs() == FALSE )
{
// delete ourself
m_trackView->getTrackContentWidget()->
removeTCOView( this );
m_tco->deleteLater();
remove();
}
}
}
@@ -567,7 +574,7 @@ void trackContentObjectView::contextMenuEvent( QContextMenuEvent * _cme )
{
contextMenu.addAction( embed::getIconPixmap( "cancel" ),
tr( "Delete (middle mousebutton)" ),
m_tco, SLOT( deleteLater() ) );
this, SLOT( remove() ) );
contextMenu.addSeparator();
contextMenu.addAction( embed::getIconPixmap( "edit_cut" ),
tr( "Cut" ), m_tco, SLOT( cut() ) );