From cc5f9eea591a9c9265e76e541e9afde7fd2b1232 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Tue, 19 Mar 2019 13:54:45 +0000 Subject: [PATCH] Return different Window handle after ReplaceWindow is called Change-Id: I09b1f54ffd9f583fcf973ec503ac1ab26ffa8783 --- dali/internal/adaptor/common/application-impl.cpp | 2 +- dali/internal/window-system/common/window-impl.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dali/internal/adaptor/common/application-impl.cpp b/dali/internal/adaptor/common/application-impl.cpp index 4828729..b90e743 100755 --- 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 --- 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) -- 2.7.4