projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
video-view
/
video-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
index
baacf73
..
cd11ea1
100755
(executable)
--- a/
dali-toolkit/internal/controls/video-view/video-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/video-view/video-view-impl.cpp
@@
-194,7
+194,11
@@
void VideoView::SetPropertyMap( Property::Map map )
if( shaderValue )
{
- mEffectPropertyMap = *( shaderValue->GetMap() );
+ Property::Map* shaderMap = shaderValue->GetMap();
+ if( shaderMap )
+ {
+ mEffectPropertyMap = *shaderMap;
+ }
}
}