From 52835a5e021d81d5669fc29bcad04f8eb3b6bf02 Mon Sep 17 00:00:00 2001 From: Sung-Jin Park Date: Wed, 19 Aug 2020 13:12:56 +0900 Subject: [PATCH] libds-mock: initialize member variables and add exception code @ constructor of MockWaylandCompositor Change-Id: I7ac66ef93fce9a08b3e5bbacd48079c7b44e00f5 Signed-off-by: Sung-Jin Park --- tests/libds-mock.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/libds-mock.h b/tests/libds-mock.h index 6bd23ef..ac77287 100644 --- a/tests/libds-mock.h +++ b/tests/libds-mock.h @@ -40,13 +40,19 @@ class MockWaylandCompositor : public DSObject { public: MockWaylandCompositor() - : surfaceCreated(false) + : surfaceCreated(false), + surfaceCommitted(false), + __waylandSurface(nullptr) { __eventLoop = DSEventLoop::getInstance(); __waylandCompositor = DSWaylandCompositor::getInstance(); - __waylandCompositor->create(); - __waylandCompositor->registerCallbackSurfaceCreated(this, std::bind(&MockWaylandCompositor::onSurfaceCreated, this, std::placeholders::_1)); + + if (__waylandCompositor) + { + __waylandCompositor->create(); + __waylandCompositor->registerCallbackSurfaceCreated(this, std::bind(&MockWaylandCompositor::onSurfaceCreated, this, std::placeholders::_1)); + } } ~MockWaylandCompositor() -- 2.7.4