forked from qt-creator/qt-creator
don't ignore file changes while reload dialog is up
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:
@@ -866,6 +866,10 @@ void FileManager::checkForReload()
|
||||
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
|
||||
// we can't do the "resolving" already in expectFileChange, because
|
||||
// if the resolved names are different when unexpectFileChange is called
|
||||
@@ -1006,9 +1010,6 @@ void FileManager::checkForReload()
|
||||
d->m_blockedIFile = 0;
|
||||
}
|
||||
|
||||
// clean up
|
||||
d->m_changedFiles.clear();
|
||||
|
||||
// handle deleted files
|
||||
EditorManager::instance()->closeEditors(editorsToClose, false);
|
||||
QMapIterator<IFile *, QString> it(filesToSave);
|
||||
|
Reference in New Issue
Block a user