Merge remote-tracking branch 'upstream/master'

Merge branch 'master' into 'master'
fix crash when "scroll_speed" is not a number See merge request VanessaE/led_marquee!5
2025-06-28 14:26:18 +02:00 · 2020-09-11 20:45:38 +02:00 · 2020-09-09 10:29:17 +00:00 · 2020-09-09 19:22:14 +10:00 · 2020-07-23 16:01:08 +02:00
1 changed files with 2 additions and 1 deletions
--- a/init.lua
+++ b/init.lua
@ -360,7 +360,7 @@ local on_digiline_receive_string = function(pos, node, channel, msg)
 				led_marquee.set_timer(pos, 0)
 				return
 			elseif string.sub(msg, 1, 12) == "scroll_speed" then
-				local timeout = tonumber(string.sub(msg, 13))
+				local timeout = tonumber(string.sub(msg, 13)) or 0
 				led_marquee.set_timer(pos, math.max(timeout, led_marquee.message_minimum_time))
 			elseif string.sub(msg, 1, 11) == "scroll_step" then
 				local skip = tonumber(string.sub(msg, 12))
@ -474,3 +474,4 @@ minetest.register_craft({
 	},
 })

+minetest.log("action", "[led_marquee] loaded.")
Author	SHA1	Message	Date
sys4	79bc4755dd	Merge remote-tracking branch 'upstream/master'	2020-09-11 20:45:38 +02:00
Vanessa Dannenberg	642aec419a	Merge branch 'master' into 'master' fix crash when "scroll_speed" is not a number See merge request VanessaE/led_marquee!5	2020-09-09 10:29:17 +00:00
OgelGames	caf6e24d04	fix crash when "scroll_speed" is not a number	2020-09-09 19:22:14 +10:00
sys4	b081594e2c	Add loading message to action log	2020-07-23 16:01:08 +02:00