mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-06 14:16:32 +02:00
* Don't crash when removing page in history.
This commit is contained in:
@@ -616,14 +616,7 @@ ViewManager::destroyPage( ViewPage* page )
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
tDebug() << Q_FUNC_INFO << "Deleting page:" << page->title();
|
tDebug() << Q_FUNC_INFO << "Deleting page:" << page->title();
|
||||||
if ( m_currentPage == page )
|
if ( historyPages().contains( page ) )
|
||||||
{
|
|
||||||
delete page;
|
|
||||||
m_currentPage = 0;
|
|
||||||
|
|
||||||
historyBack();
|
|
||||||
}
|
|
||||||
else if ( historyPages().contains( page ) )
|
|
||||||
{
|
{
|
||||||
m_pageHistoryBack.removeAll( page );
|
m_pageHistoryBack.removeAll( page );
|
||||||
m_pageHistoryFwd.removeAll( page );
|
m_pageHistoryFwd.removeAll( page );
|
||||||
@@ -633,6 +626,13 @@ ViewManager::destroyPage( ViewPage* page )
|
|||||||
|
|
||||||
delete page;
|
delete page;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( m_currentPage == page )
|
||||||
|
{
|
||||||
|
m_currentPage = 0;
|
||||||
|
|
||||||
|
historyBack();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user