X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flibhomescreen.cpp;fp=src%2Flibhomescreen.cpp;h=121def728a37f0cc40bfea1a9a0bb7e5f663e2fd;hb=11e5020569efe21957c3079c20ffd5f69f514d7a;hp=84e3472ef088f83776ade339d76193f117077273;hpb=c0146077906057bf97688a617870228eaad0cf54;p=src%2Flibhomescreen.git

diff --git a/src/libhomescreen.cpp b/src/libhomescreen.cpp
index 84e3472..121def7 100644
--- a/src/libhomescreen.cpp
+++ b/src/libhomescreen.cpp
@@ -25,6 +25,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <thread>
 
 #include <libhomescreen.hpp>
 #include "hmi-debug.h"
@@ -87,6 +88,12 @@ static void _on_reply_static(void *closure, struct afb_wsj1_msg *msg)
 }
 
 
+static void event_loop_run(struct sd_event* loop){
+	sd_event_loop(loop);
+	sd_event_unref(loop);
+}
+
+
 /**
  * constructor
  */
@@ -99,14 +106,14 @@ LibHomeScreen::LibHomeScreen()
  */
 LibHomeScreen::~LibHomeScreen()
 {
-	if(mploop)
-	{
-		sd_event_unref(mploop);
-	}
 	if(sp_websock != NULL)
 	{
 		afb_wsj1_unref(sp_websock);
 	}
+	if(mploop)
+	{
+		sd_event_exit(mploop, 0);
+	}
 }
 
 /**
@@ -177,13 +184,19 @@ int LibHomeScreen::initialize_websocket()
 	mploop = NULL;
 	onEvent = nullptr;
 	onReply = nullptr;
-	int ret = sd_event_default(&mploop);
+	int ret = sd_event_new(&mploop);
 	if(ret < 0)
 	{
 		HMI_ERROR("libhomescreen","Failed to create event loop");
 		goto END;
 	}
 
+	{
+		// enforce context to avoid initialization/goto error
+		std::thread th(event_loop_run, mploop);
+		th.detach();
+	}
+
 	/* Initialize interface from websocket */
 	minterface.on_hangup = _on_hangup_static;
 	minterface.on_call = _on_call_static;
@@ -201,10 +214,6 @@ int LibHomeScreen::initialize_websocket()
 
 	return 0;
 END:
-	if(mploop)
-	{
-		sd_event_unref(mploop);
-	}
 	return -1;
 }