RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #930 from tchebb/fix-compiler-warnings 

Fix a few compiler warnings
pull/844/head
Alex 2020-12-01 09:09:02 +01:00 committed by GitHub
parent 1ea662a08d 29f78e0426
commit f74c22e851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/clock.cpp
View File

@ -85,13 +85,11 @@ bool waybar::modules::Clock::handleScroll(GdkEventScroll *e) {
return true; return true;
} }
auto nr_zones = config_["timezones"].size(); auto nr_zones = config_["timezones"].size();
int new_idx = time_zone_idx_ + ((dir == SCROLL_DIR::UP) ? 1 : -1); if (dir == SCROLL_DIR::UP) {
if (new_idx < 0) { size_t new_idx = time_zone_idx_ + 1;
time_zone_idx_ = nr_zones - 1; time_zone_idx_ = new_idx == nr_zones ? 0 : new_idx;
} else if (new_idx >= nr_zones) {
time_zone_idx_ = 0;
} else { } else {
time_zone_idx_ = new_idx; time_zone_idx_ = time_zone_idx_ == 0 ? nr_zones - 1 : time_zone_idx_ - 1;
} }
auto zone_name = config_["timezones"][time_zone_idx_]; auto zone_name = config_["timezones"][time_zone_idx_];
if (!zone_name.isString() || zone_name.empty()) { if (!zone_name.isString() || zone_name.empty()) {

2
src/modules/mpd/mpd.cpp
View File

@ -100,7 +100,7 @@ void waybar::modules::MPD::setLabel() {
auto format = format_; auto format = format_;
std::string artist, album_artist, album, title, date; std::string artist, album_artist, album, title, date;
int song_pos, queue_length; int song_pos = 0, queue_length = 0;
std::chrono::seconds elapsedTime, totalTime; std::chrono::seconds elapsedTime, totalTime;
std::string stateIcon = ""; std::string stateIcon = "";