Fix the bug system initailize and shutdown pair.

This patch is to fix the bug system initailize and shutdown pair.
Sometimes,  WindowSystem::Shutdown() is called before WindowSystem::Initialize() is not calling.
The example is the below.
int UtcDaliApplicationNew01(void)
{
  Application application = Application::New();

  MyTestApp testApp(application);

  DALI_TEST_CHECK(application);

  END_TEST;
}

Change-Id: Icf3c19757bdc2b772bdc8fdd6ef1b67eba3f2c8b

diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp
index 3efd7a552bc105271af26275d0b6d437317b2065..d81c67b7e987fbaf543bf21979325e9a7383b2bc 100644 (file)
--- a/dali/internal/adaptor/common/application-impl.cpp
+++ b/dali/internal/adaptor/common/application-impl.cpp
@@ -111,6 +111,7 @@ Application::Application(int* argc, char** argv[], const std::string& stylesheet
   mLaunchpadState(Launchpad::NONE),
   mDefaultWindowType(windowData.GetWindowType()),
   mUseUiThread(useUiThread),
+  mIsSystemInitialized(false),
   mSlotDelegate(this)
 {
   // Set mName from command-line args
@@ -151,7 +152,10 @@ Application::~Application()
   {
     delete mAdaptor;
     delete mAdaptorBuilder;
-    WindowSystem::Shutdown();
+    if(mIsSystemInitialized)
+    {
+      WindowSystem::Shutdown();
+    }
   }
 }
 
@@ -213,6 +217,7 @@ void Application::CreateWindow()
   windowData.SetWindowType(mDefaultWindowType);
 
   WindowSystem::Initialize();
+  mIsSystemInitialized = true;
 
   if(mLaunchpadState != Launchpad::PRE_INITIALIZED)
   {

diff --git a/dali/internal/adaptor/common/application-impl.h b/dali/internal/adaptor/common/application-impl.h
index ab1b2e830f3ca51aa55e46ca07c458d06c1f33c6..8127322607505046b33431fca532c60034c0362c 100644 (file)
--- a/dali/internal/adaptor/common/application-impl.h
+++ b/dali/internal/adaptor/common/application-impl.h
@@ -540,6 +540,7 @@ private:
   WindowType       mDefaultWindowType; ///< Default window's type. It is used when Application is created.
   bool             mUseRemoteSurface;
   bool             mUseUiThread;
+  bool             mIsSystemInitialized;
 
   SlotDelegate<Application> mSlotDelegate;