summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/coreplugin/progressmanager/futureprogress.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index c4df54c760..1d5c46bc88 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -258,13 +258,14 @@ void FutureProgressPrivate::tryToFadeAway()
{
if (m_isFading)
return;
- if (m_keep == FutureProgress::KeepOnFinishTillUserInteraction) {
+ if (m_keep == FutureProgress::KeepOnFinishTillUserInteraction
+ || (m_keep == FutureProgress::DontKeepOnFinish && m_progress->hasError())) {
m_waitingForUserInteraction = true;
//eventfilter is needed to get user interaction
//events to start QTimer::singleShot later
qApp->installEventFilter(m_q);
m_isFading = true;
- } else if (m_keep == FutureProgress::DontKeepOnFinish && !m_progress->hasError()) {
+ } else if (m_keep == FutureProgress::DontKeepOnFinish) {
QTimer::singleShot(shortNotificationTimeout, m_q, SLOT(fadeAway()));
m_isFading = true;
}