feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DocumentManager: Ensure that checkForReload is called after modal dialog

Browse Source 
Task-number: QTCREATORBUG-11727

Change-Id: Ia20b4556206571f5605f4133521c146ad164426a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Daniel Teske
2014-03-14 13:03:42 +01:00
parent 5d3c070174
commit d587789cd0
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -901,9 +901,14 @@ void DocumentManager::checkForReload()
{
if (d->m_changedFiles.isEmpty())
return;
if (!QApplication::activeWindow() || QApplication::activeModalWidget())
if (!QApplication::activeWindow())
return;
if (QApplication::activeModalWidget()) { // a modal dialog, recheck later
QTimer::singleShot(200, this, SLOT(checkForReload()));
return;
}
if (d->m_blockActivated)
return;