forked from qt-creator/qt-creator
VCS: Remove "Prompt to submit" settings
Task-number: QTCREATORBUG-22233 Change-Id: Ifbfd738281066af7913357ff9e2466a6c983452c Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
committed by
Orgad Shaneh
parent
a450a6707e
commit
eaad78547c
@@ -1544,19 +1544,13 @@ bool PerforcePluginPrivate::submitEditorAboutToClose()
|
||||
QTC_ASSERT(editorDocument, return true);
|
||||
// Prompt the user. Force a prompt unless submit was actually invoked (that
|
||||
// is, the editor was closed or shutdown).
|
||||
bool wantsPrompt = m_settings.promptToSubmit.value();
|
||||
const VcsBaseSubmitEditor::PromptSubmitResult answer =
|
||||
perforceEditor->promptSubmit(this, &wantsPrompt, !m_submitActionTriggered);
|
||||
perforceEditor->promptSubmit(this, !m_submitActionTriggered);
|
||||
m_submitActionTriggered = false;
|
||||
|
||||
if (answer == VcsBaseSubmitEditor::SubmitCanceled)
|
||||
return false;
|
||||
|
||||
// Set without triggering the checking mechanism
|
||||
if (wantsPrompt != m_settings.promptToSubmit.value()) {
|
||||
m_settings.promptToSubmit.setValue(wantsPrompt);
|
||||
m_settings.writeSettings(ICore::settings());
|
||||
}
|
||||
if (!DocumentManager::saveDocument(editorDocument))
|
||||
return false;
|
||||
if (answer == VcsBaseSubmitEditor::SubmitDiscarded) {
|
||||
|
||||
Reference in New Issue
Block a user