From aa14bcd540386de4f2c1d9d4caa2131b8148ddd4 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Tue, 22 Aug 2017 13:56:19 +0900
Subject: [PATCH] Add ScopedGMainLoop for gmainloop

Change-Id: Ie45393f7d1c7c3c99fff3835f12df14be90cbfa2
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
---
 server/main.cpp   | 3 +++
 server/server.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/main.cpp b/server/main.cpp
index 448df58..8c15275 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -25,6 +25,8 @@
 #include <iostream>
 #include <stdexcept>
 
+#include <klay/gmainloop.h>
+
 #include "server.h"
 
 void signalHandler(int signum)
@@ -39,6 +41,7 @@ int main(int argc, char *argv[])
 	::umask(0);
 
 	try {
+		ScopedGMainLoop gmainloop;
 		Server server;
 		server.run();
 	} catch (std::exception &e) {
diff --git a/server/server.cpp b/server/server.cpp
index db3af1a..54ee475 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -58,7 +58,7 @@ Server::~Server()
 void Server::run()
 {
 	// Prepare execution environment
-	service->start(true);
+	service->start();
 }
 
 void Server::terminate()
-- 
2.7.4