projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Fix the converity issue of GlWindow
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
common
/
gl-window-impl.cpp
diff --git
a/dali/internal/window-system/common/gl-window-impl.cpp
b/dali/internal/window-system/common/gl-window-impl.cpp
index
8ac0e17
..
d9b96f7
100644
(file)
--- a/
dali/internal/window-system/common/gl-window-impl.cpp
+++ b/
dali/internal/window-system/common/gl-window-impl.cpp
@@
-94,6
+94,9
@@
GlWindow::GlWindow()
mFocusChangeSignal(),
mResizedSignal(),
mVisibilityChangedSignal(),
mFocusChangeSignal(),
mResizedSignal(),
mVisibilityChangedSignal(),
+ mGLInitCallback( 0 ),
+ mGLRenderFrameCallback( 0 ),
+ mGLTerminateCallback( 0 ),
mGLRenderCallback( nullptr ),
mEGLSurface( nullptr ),
mEGLContext( nullptr ),
mGLRenderCallback( nullptr ),
mEGLSurface( nullptr ),
mEGLContext( nullptr ),
@@
-113,7
+116,10
@@
GlWindow::~GlWindow()
mEventHandler->RemoveObserver( *this );
}
mEventHandler->RemoveObserver( *this );
}
- mGLTerminateCallback();
+ if( mGLTerminateCallback )
+ {
+ mGLTerminateCallback();
+ }
if( mIsEGLInitialize )
{
if( mIsEGLInitialize )
{
@@
-767,11
+773,17
@@
bool GlWindow::RunCallback()
if( !mInitCallback )
{
if( !mInitCallback )
{
- mGLInitCallback();
+ if( mGLInitCallback )
+ {
+ mGLInitCallback();
+ }
mInitCallback = true;
}
mInitCallback = true;
}
- mGLRenderFrameCallback();
+ if( mGLRenderFrameCallback )
+ {
+ mGLRenderFrameCallback();
+ }
if( mIsWindowRotated )
{
if( mIsWindowRotated )
{