From 00e52ec8ee38a85737c093d90ebfba5069829608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roman=20Smr=C5=BE?= <roman.smrz@seznam.cz>
Date: Sat, 8 May 2021 18:37:07 +0200
Subject: FRP: run callback when starting to watch behavior

---
 include/erebos/frp.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'include/erebos/frp.h')

diff --git a/include/erebos/frp.h b/include/erebos/frp.h
index 8014536..681aee8 100644
--- a/include/erebos/frp.h
+++ b/include/erebos/frp.h
@@ -160,11 +160,18 @@ using Bhv = BhvFun<monostate, A>;
 template<typename A>
 Watched<A> Bhv<A>::watch(function<void(const A &)> f)
 {
+	BhvCurTime ctime;
+	auto & impl = BhvFun<monostate, A>::impl;
+	if (impl->needsUpdate(ctime))
+		impl->doUpdate(ctime);
+
 	auto cb = make_shared<function<void(const BhvCurTime &)>>(
 			[impl = BhvFun<monostate, A>::impl, f] (const BhvCurTime & ctime) {
 				f(impl->get(ctime, monostate()));
 			});
-	BhvFun<monostate, A>::impl->watchers.push_back(cb);
+
+	impl->watchers.push_back(cb);
+	f(impl->get(ctime, monostate()));
 	return Watched<A>(move(cb));
 }
 
-- 
cgit v1.2.3