lib/tamashii/agent/lcd.rb in tamashii-agent-0.2.6 vs lib/tamashii/agent/lcd.rb in tamashii-agent-0.2.7

@@ -23,10 +23,11 @@
 
         def initialize(line)
           @line = line
           @text = ""
           @pos = -1
+          @stop_animation = false
         end
 
         def set_text(text)
           return if text == @text
           stop_animation
@@ -46,24 +47,30 @@
         end
 
         def start_animation
           @pos = 0
           @max_pos = @text.size - @@line_width
+          @stop_animation = false
           logger.debug "Start animation for line #{@line}: #{@text}"
           @animation_thread = Thread.new { animation_loop }
         end
 
         def animation_loop
           loop do
             sleep Config.lcd_animation_delay
             animation_show_text
+            break if @stop_animation
             sleep 1 if @pos == 0 || @pos == @max_pos
           end
         end
 
         def stop_animation
-          @animation_thread.exit if @animation_thread
-          @animation_thread = nil
+          @stop_animation = true
+          if @animation_thread
+            @animation_thread.join(1)
+            @animation_thread.exit 
+            @animation_thread = nil
+          end
         end
 
         def print_text(text)
           @@handler_print_line&.call(text, @line)
         end