Change-Id: I09b1f54ffd9f583fcf973ec503ac1ab26ffa8783
{
// 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
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)