From ba78199dd1a8bc7e240ea560e70d6626500eadf1 Mon Sep 17 00:00:00 2001
From: Tamir Zahavi-Brunner <tamir.z3@gmail.com>
Date: Fri, 28 Aug 2020 01:16:41 +0300
Subject: [PATCH] custom: Fix "restart-interval"

This commit fixes the issue where the process would restart immediately
and the thread would sleep after the process has restarted, and not
before.

Fixes #621
---
 src/modules/custom.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/modules/custom.cpp b/src/modules/custom.cpp
index 56431609..5ee9bb52 100644
--- a/src/modules/custom.cpp
+++ b/src/modules/custom.cpp
@@ -50,7 +50,6 @@ void waybar::modules::Custom::continuousWorker() {
   thread_ = [this, cmd] {
     char*  buff = nullptr;
     size_t len = 0;
-    bool   restart = false;
     if (getline(&buff, &len, fp_) == -1) {
       int exit_code = 1;
       if (fp_) {
@@ -63,8 +62,8 @@ void waybar::modules::Custom::continuousWorker() {
         spdlog::error("{} stopped unexpectedly, is it endless?", name_);
       }
       if (config_["restart-interval"].isUInt()) {
-        restart = true;
         pid_ = -1;
+        thread_.sleep_for(std::chrono::seconds(config_["restart-interval"].asUInt()));
         fp_ = util::command::open(cmd, pid_);
         if (!fp_) {
           throw std::runtime_error("Unable to open " + cmd);
@@ -83,9 +82,6 @@ void waybar::modules::Custom::continuousWorker() {
       output_ = {0, output};
       dp.emit();
     }
-    if (restart) {
-      thread_.sleep_for(std::chrono::seconds(config_["restart-interval"].asUInt()));
-    }
   };
 }