diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2012-09-14 06:52:13 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2012-09-14 06:52:13 (GMT) |
commit | e512c1becd6fc267e64460f0883a16b4975da19e (patch) | |
tree | e8ed253b12726f909bd8f31e00feba9ccda782a9 | |
parent | 2f279e96b16b40ac8f1aa0b9850dd13f7ec4d0ae (diff) | |
download | fluxbox-e512c1becd6fc267e64460f0883a16b4975da19e.zip fluxbox-e512c1becd6fc267e64460f0883a16b4975da19e.tar.bz2 |
minor cosmetic
-rw-r--r-- | src/ClockTool.cc | 7 | ||||
-rw-r--r-- | src/FbTk/Timer.cc | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/ClockTool.cc b/src/ClockTool.cc index 1fcdb53..3591f4f 100644 --- a/src/ClockTool.cc +++ b/src/ClockTool.cc | |||
@@ -72,9 +72,10 @@ uint64_t calcNextTimeout(const std::string& fmt_string) { | |||
72 | 72 | ||
73 | if (showSeconds(fmt_string)) { // microseconds till next full second | 73 | if (showSeconds(fmt_string)) { // microseconds till next full second |
74 | return FbTk::FbTime::remainingNext(FbTk::FbTime::IN_SECONDS); | 74 | return FbTk::FbTime::remainingNext(FbTk::FbTime::IN_SECONDS); |
75 | } else { // microseconds until next full minute | 75 | } |
76 | return FbTk::FbTime::remainingNext(60L * FbTk::FbTime::IN_SECONDS); | 76 | |
77 | } | 77 | // microseconds until next full minute |
78 | return FbTk::FbTime::remainingNext(60L * FbTk::FbTime::IN_SECONDS); | ||
78 | } | 79 | } |
79 | 80 | ||
80 | 81 | ||
diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc index b9d089f..f63ea38 100644 --- a/src/FbTk/Timer.cc +++ b/src/FbTk/Timer.cc | |||
@@ -170,8 +170,7 @@ void Timer::updateTimers(int fd) { | |||
170 | uint64_t now = FbTime::now(); | 170 | uint64_t now = FbTime::now(); |
171 | uint64_t end_time; | 171 | uint64_t end_time; |
172 | 172 | ||
173 | // see, if the first timer in the | 173 | // search for overdue timers |
174 | // list is overdue | ||
175 | if (!s_timerlist.empty()) { | 174 | if (!s_timerlist.empty()) { |
176 | 175 | ||
177 | Timer* timer = *s_timerlist.begin(); | 176 | Timer* timer = *s_timerlist.begin(); |
@@ -200,8 +199,7 @@ void Timer::updateTimers(int fd) { | |||
200 | for (it = s_timerlist.begin(); it != s_timerlist.end(); ) { | 199 | for (it = s_timerlist.begin(); it != s_timerlist.end(); ) { |
201 | 200 | ||
202 | // t->fireTimeout() might add timers to the list | 201 | // t->fireTimeout() might add timers to the list |
203 | // this invalidates 'it'. thus we store the current | 202 | // this invalidates 'it'. thus we store the current timer |
204 | // item here | ||
205 | Timer* t = *it; | 203 | Timer* t = *it; |
206 | if (now < t->getEndTime()) { | 204 | if (now < t->getEndTime()) { |
207 | break; | 205 | break; |