summaryrefslogtreecommitdiff
path: root/src/mainwin.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-11-09 17:40:52 (GMT)
committerMarius Kintel <marius@kintel.net>2011-11-09 17:40:52 (GMT)
commitcabff81c70f7d9083c47f5be8b5bc071168e6b35 (patch)
treeb053902ada395ec5cbef8638c897b526ca742857 /src/mainwin.cc
parented6dd37dd5e21a665298a4afb68506ce9ac4a138 (diff)
parente65ea2d6515f205526c9cba77ad0831e3b4077d1 (diff)
Merge branch 'master' into cache
Diffstat (limited to 'src/mainwin.cc')
-rw-r--r--src/mainwin.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc
index a6f5be6..22fb82c 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -433,7 +433,8 @@ static void report_func(const class AbstractNode*, void *vp, int mark)
#ifdef USE_PROGRESSWIDGET
ProgressWidget *pw = static_cast<ProgressWidget*>(vp);
int v = (int)((mark*100.0) / progress_report_count);
- pw->setValue(v < 100 ? v : 99);
+ int percent = v < 100 ? v : 99;
+ if (percent > pw->value()) pw->setValue(percent);
QApplication::processEvents();
if (pw->wasCanceled()) throw ProgressCancelException();
#else
contact: Jan Huwald // Impressum