diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-13 16:40:20 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-13 16:40:20 (GMT) |
| commit | 1f9ce62573b65715e7b134ad4d8c8079fc28aa44 (patch) | |
| tree | 40ac192b4d368cccc12e7b4e36c3dc7da5fba72f /src/mainwin.cc | |
| parent | 3eb466b5a9dcb7507045898efc7ad52226f54782 (diff) | |
| parent | 2cfcdf557d7742422965035a64ef617ac043a429 (diff) | |
Merge branch 'master' into cakebaby
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 3 |
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 |