diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2012-09-14 06:51:42 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2012-09-14 06:51:42 (GMT) |
commit | 2f279e96b16b40ac8f1aa0b9850dd13f7ec4d0ae (patch) | |
tree | e8d18c6e6bb47f39109ca73be5c4b1834332d4bf /src/FbTk/Timer.cc | |
parent | 59d097bcead9b349e20a4ec193d76330e6899e53 (diff) | |
download | fluxbox-2f279e96b16b40ac8f1aa0b9850dd13f7ec4d0ae.zip fluxbox-2f279e96b16b40ac8f1aa0b9850dd13f7ec4d0ae.tar.bz2 |
Fix regression: switch back to microseconds for DelayCmd
Diffstat (limited to 'src/FbTk/Timer.cc')
-rw-r--r-- | src/FbTk/Timer.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc index 38f1a32..b9d089f 100644 --- a/src/FbTk/Timer.cc +++ b/src/FbTk/Timer.cc | |||
@@ -239,21 +239,21 @@ Command<void> *DelayedCmd::parse(const std::string &command, | |||
239 | if (cmd == 0) | 239 | if (cmd == 0) |
240 | return 0; | 240 | return 0; |
241 | 241 | ||
242 | int delay = 200; | 242 | uint64_t delay = 200; |
243 | StringUtil::fromString<int>(args.c_str() + err, delay); | 243 | StringUtil::fromString<uint64_t>(args.c_str() + err, delay); |
244 | 244 | ||
245 | return new DelayedCmd(cmd, delay); | 245 | return new DelayedCmd(cmd, delay); |
246 | } | 246 | } |
247 | 247 | ||
248 | REGISTER_COMMAND_PARSER(delay, DelayedCmd::parse, void); | 248 | REGISTER_COMMAND_PARSER(delay, DelayedCmd::parse, void); |
249 | 249 | ||
250 | DelayedCmd::DelayedCmd(const RefCount<Slot<void> > &cmd, unsigned int timeout) { | 250 | DelayedCmd::DelayedCmd(const RefCount<Slot<void> > &cmd, uint64_t timeout) { |
251 | initTimer(timeout); | 251 | initTimer(timeout); |
252 | m_timer.setCommand(cmd); | 252 | m_timer.setCommand(cmd); |
253 | } | 253 | } |
254 | 254 | ||
255 | void DelayedCmd::initTimer(unsigned int timeout) { | 255 | void DelayedCmd::initTimer(uint64_t timeout) { |
256 | m_timer.setTimeout(timeout * FbTime::IN_MILLISECONDS); | 256 | m_timer.setTimeout(timeout); |
257 | m_timer.fireOnce(true); | 257 | m_timer.fireOnce(true); |
258 | } | 258 | } |
259 | 259 | ||