From 7fb40fb5f2369fb1f99eee01f9d70314cda03d43 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Sat, 24 Apr 2021 19:05:45 -0500 Subject: [PATCH] Revert "fix: update `update last_update_time` earlier, so the network speed is correctly displayed, otherwise the speed shown is much lower than the actual speed (resolves #863)" This reverts commit 415c730133476d6652f479242b0638496b5f673b. --- src/conky.cc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/conky.cc b/src/conky.cc index 4369d2d4..47f510fe 100644 --- a/src/conky.cc +++ b/src/conky.cc @@ -783,12 +783,6 @@ static void generate_text() { * some info.mem entries */ update_stuff(); - /* Update `last_update_time` before `generate_text_internal()`, as the latter - * calls `evaluate()` -> `update_net_stats()`, which needs `last_update_time` - * to be set correctly. If this is not done, than the network speed being - * shown will be much lower than the actual speed.*/ - last_update_time = current_update_time; - /* populate the text buffer; generate_text_internal() iterates through * global_root_object (an instance of the text_object struct) and calls * any callbacks that were set on startup by construct_text_object(). */ @@ -845,6 +839,7 @@ static void generate_text() { if (next_update_time < time || next_update_time > time + ui) { next_update_time = time - fmod(time, ui) + ui; } + last_update_time = current_update_time; total_updates++; }