From 626ebdb00d3aa7edb66ea69a549f72a846255ff1 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Wed, 3 Aug 2022 14:09:33 +0200
Subject: [PATCH] Factor out a bit of duplicate code

---
 src/progress_bar.rs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/progress_bar.rs b/src/progress_bar.rs
index 5db0fa09..2b36d719 100644
--- a/src/progress_bar.rs
+++ b/src/progress_bar.rs
@@ -191,9 +191,13 @@ impl ProgressBar {
     ///
     /// This automatically happens on any other change to a progress bar.
     pub fn tick(&self) {
+        self.tick_inner(Instant::now());
+    }
+
+    fn tick_inner(&self, now: Instant) {
         // Only tick if a `Ticker` isn't installed
         if self.ticker.lock().unwrap().is_none() {
-            self.state().tick(Instant::now())
+            self.state().tick(now)
         }
     }
 
@@ -201,8 +205,8 @@ impl ProgressBar {
     pub fn inc(&self, delta: u64) {
         self.pos.inc(delta);
         let now = Instant::now();
-        if self.pos.allow(now) && self.ticker.lock().unwrap().is_none() {
-            self.state().tick(now);
+        if self.pos.allow(now) {
+            self.tick_inner(now);
         }
     }
 
@@ -241,8 +245,8 @@ impl ProgressBar {
     pub fn set_position(&self, pos: u64) {
         self.pos.set(pos);
         let now = Instant::now();
-        if self.pos.allow(now) && self.ticker.lock().unwrap().is_none() {
-            self.state().tick(now);
+        if self.pos.allow(now) {
+            self.tick_inner(now);
         }
     }