From dfb939516037e184561c3e7614c82d2c2c189e67 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sat, 7 Jun 2008 23:05:15 +0000 Subject: [PATCH] in song::setModified() only call mainWindow::resetWindowTitle() when being calle with GUI-thread affinity git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1093 0778d3d1-df1d-0410-868b-ea421aaaa00d --- src/core/song.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/core/song.cpp b/src/core/song.cpp index 4424103b9..3108646dc 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -797,8 +797,7 @@ void song::createNewProject( void ) -void FASTCALL song::createNewProjectFromTemplate( const QString & - _template ) +void song::createNewProjectFromTemplate( const QString & _template ) { loadProject( _template ); // clear file-name so that user doesn't overwrite template when @@ -810,7 +809,7 @@ void FASTCALL song::createNewProjectFromTemplate( const QString & // load given song -void FASTCALL song::loadProject( const QString & _file_name ) +void song::loadProject( const QString & _file_name ) { m_loadingProject = TRUE; @@ -965,7 +964,7 @@ bool song::saveProject( void ) // save current song in given filename -bool FASTCALL song::saveProjectAs( const QString & _file_name ) +bool song::saveProjectAs( const QString & _file_name ) { QString o = m_oldFileName; m_oldFileName = m_fileName; @@ -1097,7 +1096,9 @@ void song::setModified( void ) if( !m_loadingProject ) { m_modified = TRUE; - if( engine::getMainWindow() ) + if( engine::getMainWindow() && + QThread::currentThread() == + engine::getMainWindow()->thread() ) { engine::getMainWindow()->resetWindowTitle(); }