Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 22 Nov 2017 02:36:10 +0100
changeset 8415 0ea1e95b3a11
parent 8413 54ff1f91e4db (current diff)
parent 8414 a9e8523a5e73 (diff)
child 8416 9a234e25b35b
Merge 0.10->trunk
--- a/util/helpers.lua	Tue Nov 21 23:16:16 2017 +0100
+++ b/util/helpers.lua	Wed Nov 22 02:36:10 2017 +0100
@@ -50,7 +50,7 @@
 			local handler_strings = {};
 			for i, handler in ipairs(handlers) do
 				local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
-				handler_strings[i] = "  "..priorities[handler]..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
+				handler_strings[i] = "  "..(priorities[handler] or "?")..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
 			end
 			event_handler_arrays[event] = handler_strings;
 		end