Merge branch 'b11.26' into 'master'11.26

add upstream 11.26

See merge request opensource-tracking/FreeFileSync!49

1 files changed, 3 insertions, 5 deletions

diff --git a/zen/perf.h b/zen/perf.h
index 76c98c85..c3315717 100644
--- a/zen/perf.h
+++ b/zen/perf.h
@@ -96,14 +96,12 @@ public:
 
     void showResult()
     {
-        const bool wasRunning = !watch_.isPaused();
-        if (wasRunning) watch_.pause(); //don't include call to MessageBox()!
-        ZEN_ON_SCOPE_EXIT(if (wasRunning) watch_.resume());
-
         const int64_t timeMs = std::chrono::duration_cast<std::chrono::milliseconds>(watch_.elapsed()).count();
         const std::string msg = numberTo<std::string>(timeMs) + " ms";
-        std::clog << "Perf: duration: " << msg << '\n';
+        std::clog << "Perf: duration: " << msg + '\n';
         resultShown_ = true;
+
+        watch_ = StopWatch(watch_.isPaused());
     }
 
 private: