X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=server%2Factuator.c;h=9b9a1a8f73bdc975667b9b5829a5a309efcf3215;hb=692f7d0b2a4013aa93356f57247b98cc1dd8d5eb;hp=e650cf88c5a877a4a08608dabe03e378617ca80a;hpb=450583abb79d5fedb0debabed073d9b191dac80c;p=matches%2FMCTX3420.git

diff --git a/server/actuator.c b/server/actuator.c
index e650cf8..9b9a1a8 100644
--- a/server/actuator.c
+++ b/server/actuator.c
@@ -36,12 +36,17 @@ int Actuator_Add(const char * name, int user_id, SetFn set, InitFn init, CleanFn
 	a->name = name;
 	a->set = set; // Set read function
 	a->init = init; // Set init function
-	if (init != NULL)
-		init(name, user_id); // Call it
+
 	a->sanity = sanity;
 
 	pthread_mutex_init(&(a->mutex), NULL);
 
+	if (init != NULL)
+	{
+		if (!init(name, user_id))
+			Fatal("Couldn't initialise actuator %s", name);
+	}
+
 	Actuator_SetValue(a, initial_value, false);
 
 	return g_num_actuators;