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

Mark file modified externally as modified after the prompt

Browse Source 
In case when the user has chosen not to reload the file.

Task-number: QTCREATORBUG-17048
Change-Id: I4eb78af2dbc655ab5e0f3fa19f506aa2302d7877
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jarek Kobus
2016-10-17 13:33:34 +02:00
committed by Jarek Kobus
parent 59c90e00c1
commit d0c537ca75
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1052,6 +1052,7 @@ void DocumentManager::checkForReload()
documentsToClose << document; documentsToClose << document;
} else if (defaultBehavior == IDocument::IgnoreAll) { } else if (defaultBehavior == IDocument::IgnoreAll) {
// content change or removed, but settings say ignore // content change or removed, but settings say ignore
document->setModified(true);
success = document->reload(&errorString, IDocument::FlagIgnore, type); success = document->reload(&errorString, IDocument::FlagIgnore, type);
// either the default behavior is to always ask, // either the default behavior is to always ask,
// or the ReloadUnmodified default behavior didn't kick in, // or the ReloadUnmodified default behavior didn't kick in,
@@ -1069,6 +1070,7 @@ void DocumentManager::checkForReload()
// content change, IDocument wants to ask user // content change, IDocument wants to ask user
if (previousReloadAnswer == ReloadNone) { if (previousReloadAnswer == ReloadNone) {
// answer already given, ignore // answer already given, ignore
document->setModified(true);
success = document->reload(&errorString, IDocument::FlagIgnore, IDocument::TypeContents); success = document->reload(&errorString, IDocument::FlagIgnore, IDocument::TypeContents);
} else if (previousReloadAnswer == ReloadAll) { } else if (previousReloadAnswer == ReloadAll) {
// answer already given, reload // answer already given, reload
@@ -1084,6 +1086,7 @@ void DocumentManager::checkForReload()
break; break;
case ReloadSkipCurrent: case ReloadSkipCurrent:
case ReloadNone: case ReloadNone:
document->setModified(true);
success = document->reload(&errorString, IDocument::FlagIgnore, IDocument::TypeContents); success = document->reload(&errorString, IDocument::FlagIgnore, IDocument::TypeContents);
break; break;
case CloseCurrent: case CloseCurrent: