summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2013-02-01 02:00:22 (GMT)
committerJames Meyer <james.meyer@operamail.com>2013-02-01 02:00:22 (GMT)
commit5989659bee4c660d0b99282075c31b12bf22f8ba (patch)
tree3288f3e0d0d7f6bc3ac09fc41c925bc7d506978b /abs
parent76eb853cc23021b5272acb43c776f11115879137 (diff)
downloadlinhes_pkgbuild-5989659bee4c660d0b99282075c31b12bf22f8ba.zip
linhes_pkgbuild-5989659bee4c660d0b99282075c31b12bf22f8ba.tar.gz
linhes_pkgbuild-5989659bee4c660d0b99282075c31b12bf22f8ba.tar.bz2
LinHES-system: msg_daemon.py fix init and nasty bug related to timeout.
In a nutshell timeout wouldn't work unless a msg without a timeout was called first.
Diffstat (limited to 'abs')
-rwxr-xr-xabs/core/LinHES-system/msg_daemon.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index 8601075..cd0465b 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -272,16 +272,18 @@ class msg_queue_runner(threading.Thread):
def run(self):
while True:
+ display_time = None
try:
msgdict = self.msg_queue.get_msg()
style = self.get_current_style()
if msgdict['timeout'] == None:
display_time = 3
-
+ else:
+ display_time = msgdict['timeout']
# display message here
msgtext = msgdict['msg']
if style == "enhanced":
- display_time = display_time * 1000
+ display_time = int(display_time) * 1000
self.p = multiprocessing.Process(target=self.out_msg.display, args=(msgtext,display_time))
self.p.start()
self.p.join()