Move wrapper function so it can catch errors in lazy seqs

This commit is contained in:
oakes
2014-04-21 16:41:25 -04:00
parent 6f89bec8b8
commit 7ff6ab60f4

View File

@@ -54,12 +54,13 @@
(let [execute-fn! (fn [func & {:keys [] :as options}] (let [execute-fn! (fn [func & {:keys [] :as options}]
(when func (when func
(let [old-entities @entities] (let [old-entities @entities]
(some->> #(func (merge @screen options) old-entities) (some->> #(some->> (func (merge @screen options)
(wrapper screen) old-entities)
list list
flatten flatten
(remove nil?) (remove nil?)
vec vec)
(wrapper screen)
(reset-changed! entities old-entities)))))] (reset-changed! entities old-entities)))))]
; update screen when either the screen or entities are changed ; update screen when either the screen or entities are changed
(add-watch screen :changed (fn [_ _ _ new-screen] (add-watch screen :changed (fn [_ _ _ new-screen]