Merge "Return different Window handle after ReplaceWindow is called" into devel/master

diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp
index 4828729..b90e743 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() : mMainWindow;
+  return mMainWindowReplaced ? Dali::Window::New( PositionSize(), "ReplacedWindow" ) : mMainWindow;
 }
 
 // Stereoscopy

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