Revert "[tizen] Return different Window handle after ReplaceWindow is called"

This reverts commit cadcd86eb76ad88fa941e82b2d1927ba1f04eaaf.

Change-Id: I923d7e0d0c373ac0d5e3fbb5093ac2b0f104c7bb

diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp
index b90e743..4828729 100755 (executable)
--- a/dali/internal/adaptor/common/application-impl.cpp
+++ b/dali/internal/adaptor/common/application-impl.cpp
@@ -375,7 +375,7 @@ Dali::Window Application::GetWindow()
 {
   // Changed to return a different window handle after ReplaceWindow is called
   // just for backward compatibility to make the test case pass
-  return mMainWindowReplaced ? Dali::Window::New( PositionSize(), "ReplacedWindow" ) : mMainWindow;
+  return mMainWindowReplaced ? Dali::Window() : mMainWindow;
 }
 
 // Stereoscopy

diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index 7ff03e4..bcbeae7 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -94,10 +94,8 @@ Window::~Window()
     mAdaptor = NULL;
   }
 
-  if ( mEventHandler )
-  {
-    mEventHandler->SetRotationObserver( nullptr );
-  }
+  // Do we need to do it?
+  mEventHandler->SetRotationObserver( nullptr );
 }
 
 void Window::Initialize(const PositionSize& positionSize, const std::string& name, const std::string& className)