Move wrapper function so it can catch errors in lazy seqs

2014-04-21 16:41:25 -04:00
parent 6f89bec8b8
commit 7ff6ab60f4
1 changed files with 6 additions and 5 deletions
--- a/src/play_clj/core.clj
+++ b/src/play_clj/core.clj
@@ -54,12 +54,13 @@
  (let [execute-fn! (fn [func & {:keys [] :as options}]
                      (when func
                        (let [old-entities @entities]
-                          (some->> #(func (merge @screen options) old-entities)
+                          (some->> #(some->> (func (merge @screen options)
+                                                   old-entities)
+                                             list
+                                             flatten
+                                             (remove nil?)
+                                             vec)
                                   (wrapper screen)
-                                   list
-                                   flatten
-                                   (remove nil?)
-                                   vec
                                   (reset-changed! entities old-entities)))))]
    ; update screen when either the screen or entities are changed
    (add-watch screen :changed (fn [_ _ _ new-screen]