Revert "[Tizen] Temporarily modified so that window is no null if multi-window is...

This reverts commit 8665f0e7867639372fd3e772d35d2cf68a16aefc.

diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp
index 4741340..9d8c830 100644 (file)
--- a/dali/public-api/adaptor-framework/window.cpp
+++ b/dali/public-api/adaptor-framework/window.cpp
@@ -48,21 +48,24 @@ Window Window::New(PositionSize posSize, const std::string& name, const std::str
     Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
     isNewWindowAllowed = Internal::Adaptor::Adaptor::GetImplementation(adaptor).IsMultipleWindowSupported();
   }
-  if (!isNewWindowAllowed)
-  {
-    DALI_LOG_ERROR("This device can't support multiple windows.\n");
-  }
 
-  Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, className, isTransparent);
+  if (isNewWindowAllowed)
+  {
+    Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, className, isTransparent);
 
-  Integration::SceneHolder sceneHolder = Integration::SceneHolder(window);
+    Integration::SceneHolder sceneHolder = Integration::SceneHolder(window);
 
-  if (isAdaptorAvailable)
+    if (isAdaptorAvailable)
+    {
+      Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
+      Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder, name, className, isTransparent);
+    }
+    newWindow = Window(window);
+  }
+  else
   {
-    Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
-    Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder, name, className, isTransparent);
+    DALI_LOG_ERROR("This device can't support multiple windows.\n");
   }
-  newWindow = Window(window);
 
   return newWindow;
 }