From 379c74230c4f52f198f3fbd72d63efada08cf0f3 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Wed, 28 Oct 2015 18:37:27 -0700 Subject: [PATCH] no close on fade in. --- desktop/src-common/advent/screens/scene.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index 5bbd97e8..d2696ab4 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -1238,7 +1238,8 @@ void main () :on-show-inventory (fn [screen [entities]] (click-inventory screen entities)) :on-menu (fn [screen [entities]] - (when-not (get-in entities [:tweens :fade-out]) + (when-not (or (get-in entities [:tweens :fade-out]) + (get-in entities [:tweens :fade-in])) (input! :set-cursor-image (utils/cursor "cursor.png" :hourglass) 0 0) (-> entities (assoc-in [:closing? :value] true)