From 00ce839d0366eaac9a2c28e6bff2a407e47cbdb1 Mon Sep 17 00:00:00 2001
From: wongk <kris.p.wong@gmail.com>
Date: Wed, 2 Nov 2011 12:44:31 -0400
Subject: If user cancels save file prompt, cancel entire action.

Task-Number: QTCREATORBUG-6440
Change-Id: I8807de53b1a05a0abd57c140dab5ba8df441efd5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
 src/plugins/coreplugin/filemanager.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/plugins/coreplugin/filemanager.cpp')

diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index 1aef4afdfe..22c0a79a8f 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -527,11 +527,12 @@ void FileManager::updateExpectedState(const QString &fileName)
 /*!
     \fn QList<IFile*> FileManager::saveModifiedFilesSilently(const QList<IFile*> &files)
 
-    Tries to save the files listed in \a files . Returns the files that could not be saved.
+    Tries to save the files listed in \a files. The \a cancelled argument is set to true
+    if the user cancelled the dialog. Returns the files that could not be saved.
 */
-QList<IFile *> FileManager::saveModifiedFilesSilently(const QList<IFile *> &files)
+QList<IFile *> FileManager::saveModifiedFilesSilently(const QList<IFile *> &files, bool *cancelled)
 {
-    return saveModifiedFiles(files, 0, true, QString());
+    return saveModifiedFiles(files, cancelled, true, QString());
 }
 
 /*!
-- 
cgit v1.2.1