Merge branch 'master' into feature/makefile

2018-12-28 01:16:56 +01:00 · 2018-12-28 01:16:56 +01:00 · a078be991a
parent 7804514c5c 83ae5ec5c9
commit a078be991a
2 changed files with 2 additions and 2 deletions
--- a/include/util/chrono.hpp
+++ b/include/util/chrono.hpp
@ -37,7 +37,7 @@ struct SleeperThread {
    return *this;
  }

-  bool isRunnging() const
+  bool isRunning() const
  {
    return do_run_;
  }
--- a/src/modules/sway/workspaces.cpp
+++ b/src/modules/sway/workspaces.cpp
@ -23,7 +23,7 @@ void waybar::modules::sway::Workspaces::worker()
        while (bar_.output_name.empty()) {
          thread_.sleep_for(chrono::milliseconds(150));
        }
-      } else if (thread_.isRunnging() && !workspaces_.empty()) {
+      } else if (thread_.isRunning() && !workspaces_.empty()) {
        ipc_.handleEvent();
      }
      {