Setup props once, fix initialization problem

2018-07-23 16:05:49 +02:00
parent c41717d03b
commit 3fb3aa5ad1
3 changed files with 9 additions and 4 deletions
@@ -33,7 +33,12 @@ open class ScriptingProperties(body: ScriptingProperties.() -> Unit = {}) {

    init {
        body()
-        setup() // TODO: does it work?
+        setupOnce() // TODO: does it work?
+    }
+
+    private var isSetUp = false
+    fun setupOnce() {
+        if (!isSetUp) setup()
    }

    open fun setup() {}
@@ -78,7 +83,7 @@ open class ScriptingProperties(body: ScriptingProperties.() -> Unit = {}) {
    // inclusion:

    fun include(props: ScriptingProperties) {
-        props.setup()
+        props.setupOnce()
        data.putAll(props.data)
    }