Merge branch 'master' into feature/makefile

This commit is contained in:
Alex 2018-12-28 01:16:56 +01:00 committed by GitHub
commit a078be991a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -37,7 +37,7 @@ struct SleeperThread {
return *this; return *this;
} }
bool isRunnging() const bool isRunning() const
{ {
return do_run_; return do_run_;
} }

View File

@ -23,7 +23,7 @@ void waybar::modules::sway::Workspaces::worker()
while (bar_.output_name.empty()) { while (bar_.output_name.empty()) {
thread_.sleep_for(chrono::milliseconds(150)); thread_.sleep_for(chrono::milliseconds(150));
} }
} else if (thread_.isRunnging() && !workspaces_.empty()) { } else if (thread_.isRunning() && !workspaces_.empty()) {
ipc_.handleEvent(); ipc_.handleEvent();
} }
{ {