Commit 1f06972f authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

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
parent c7c92382
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment