From: Heeyong Song <heeyong.song@samsung.com>
Date: Thu, 2 Apr 2020 04:22:14 +0000 (+0900)
Subject: Fix a crash on Ubuntu
X-Git-Tag: dali_1.5.7~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a7969906888fa260f94244a50f5e44bcfbd187c;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Fix a crash on Ubuntu

ecore_x_init() should be called before a window is created.

Change-Id: I36ffc65f5f509a90691bce36178f1a41d9ca03a5
---

diff --git a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
index 07d6ea4..ab67b43 100755
--- a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
+++ b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
@@ -20,6 +20,7 @@
 
 // INTERNAL HEADERS
 #include <dali/internal/window-system/common/window-impl.h>
+#include <dali/internal/window-system/common/window-system.h>
 #include <dali/internal/window-system/common/window-render-surface.h>
 #include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
 
@@ -263,6 +264,8 @@ WindowBaseEcoreX::~WindowBaseEcoreX()
   if( mOwnSurface )
   {
     ecore_x_window_free( mEcoreWindow );
+
+    WindowSystem::Shutdown();
   }
 }
 
@@ -274,6 +277,8 @@ void WindowBaseEcoreX::Initialize( PositionSize positionSize, Any surface, bool
   // if the surface is empty, create a new one.
   if( surfaceId == 0 )
   {
+    WindowSystem::Initialize();
+
     // we own the surface about to created
     mOwnSurface = true;
     CreateWindow( positionSize, isTransparent );