Merge branch 'master' into dev

2016-03-24 21:30:48 +01:00
parent 35cfdab67e 379219b13f
commit e2e1aae6ed
2 changed files with 2 additions and 2 deletions
@@ -1,5 +1,5 @@
 Aux = {
-    version = '2.9.18',
+    version = '2.9.19',
    blizzard_ui_shown = false,
 	orig = {},
 }
@@ -112,7 +112,7 @@ function public.stop()
 		Aux.control.kill_thread(state.thread_id)

 		local callback, slot = state.callback, state.target_slot
-		if not private.matching_item(slot) then
+		if slot and not private.matching_item(slot) then
 			slot = nil
 		end