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

don't ignore file changes while reload dialog is up

Browse Source 
we cannot clear the list of modified files after possibly entering the main
loop again, as that might discard new notifications which we have not
processed yet.

Reviewed-by: dt
This commit is contained in:
Oswald Buddenhagen
2011-04-14 21:07:13 +02:00
parent c7c9238259
commit 1f06972f1e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -866,6 +866,10 @@ void FileManager::checkForReload()
changedIFiles.insert(file); changedIFiles.insert(file);
} }
// clean up. do this before we may enter the main loop, otherwise we would
// lose consecutive notifications.
d->m_changedFiles.clear();
// collect information about "expected" file names // collect information about "expected" file names
// we can't do the "resolving" already in expectFileChange, because // we can't do the "resolving" already in expectFileChange, because
// if the resolved names are different when unexpectFileChange is called // if the resolved names are different when unexpectFileChange is called
@@ -1006,9 +1010,6 @@ void FileManager::checkForReload()
d->m_blockedIFile = 0; d->m_blockedIFile = 0;
} }
// clean up
d->m_changedFiles.clear();
// handle deleted files // handle deleted files
EditorManager::instance()->closeEditors(editorsToClose, false); EditorManager::instance()->closeEditors(editorsToClose, false);
QMapIterator<IFile *, QString> it(filesToSave); QMapIterator<IFile *, QString> it(filesToSave);