From 29614e6d263906d985cfed5468a3ba826116389c Mon Sep 17 00:00:00 2001
From: Joey De Pauw <joeydepauw@gmail.com>
Date: Sat, 4 Jan 2020 13:36:59 +0100
Subject: [PATCH] v2.3

---
 better-air-filtering/changelog.txt |  5 +++++
 better-air-filtering/control.lua   | 22 ++++++++++++----------
 better-air-filtering/info.json     |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/better-air-filtering/changelog.txt b/better-air-filtering/changelog.txt
index a5d8f0a..0279d6e 100644
--- a/better-air-filtering/changelog.txt
+++ b/better-air-filtering/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.3
+Date: 2020.01.04
+  Fixes:
+    - Register on_tick event on a different callback.
+---------------------------------------------------------------------------------------------------
 Version: 0.2.2
 Date: 2020.01.03
   Fixes:
diff --git a/better-air-filtering/control.lua b/better-air-filtering/control.lua
index a58dae6..5ee3bd3 100644
--- a/better-air-filtering/control.lua
+++ b/better-air-filtering/control.lua
@@ -557,16 +557,13 @@ end
 
 function load()
     refreshMetatables()
-
-    INTERVAL = settings.global["baf-update-interval"].value
-
-    onTick = spreadOverTicks(functions, INTERVAL)
-    script.on_event(defines.events.on_tick, onTick)
+    if INTERVAL ~= settings.global["baf-update-interval"].value then
+        setup()
+    end
 end
 
 script.on_load(load)
 
-
 function init()
     -- gather all filters on every surface
     global.air_filtered_chunks_map = {}
@@ -587,13 +584,18 @@ script.on_configuration_changed(init)
 
 function onSettingsChanged(event)
     if event.setting == "baf-update-interval" then
-        INTERVAL = settings.global["baf-update-interval"].value
-
-        onTick = spreadOverTicks(functions, INTERVAL)
-        script.on_event(defines.events.on_tick, onTick)
+        setup()
     end
 end
 
 script.on_event(defines.events.on_runtime_mod_setting_changed, onSettingsChanged)
 
 
+function setup()
+    INTERVAL = settings.global["baf-update-interval"].value
+
+    onTick = spreadOverTicks(functions, INTERVAL)
+    script.on_event(defines.events.on_tick, onTick)
+end
+
+setup()
diff --git a/better-air-filtering/info.json b/better-air-filtering/info.json
index 29be0e3..77c506d 100644
--- a/better-air-filtering/info.json
+++ b/better-air-filtering/info.json
@@ -1,6 +1,6 @@
 {
   "name": "better-air-filtering",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "title": "Better Air Filtering",
   "author": "Joey De Pauw",
   "contact": "joeydepauw@gmail.com",