summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinkyu Kang <mk7.kang@samsung.com>2015-10-13 07:08:09 (GMT)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>2015-10-13 07:08:10 (GMT)
commit21c8133a07e22df84730eafac90b8158709327c2 (patch)
treeb69568a860ee053ed7527c5d6b12af8639013067
parent04c93376ea39436e04b2941682443b1aca4e97a7 (diff)
parent468a8080f61cea6b632d2f2ee5ddc7cdefd646f1 (diff)
downloadair_mediahub-21c8133a07e22df84730eafac90b8158709327c2.zip
air_mediahub-21c8133a07e22df84730eafac90b8158709327c2.tar.gz
air_mediahub-21c8133a07e22df84730eafac90b8158709327c2.tar.bz2
Merge "viewer/mplayer: return null if cannot get current media" into tizen
-rw-r--r--src/view/mplayer.c2
-rw-r--r--src/view/viewer.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/view/mplayer.c b/src/view/mplayer.c
index 57da668..754da9f 100644
--- a/src/view/mplayer.c
+++ b/src/view/mplayer.c
@@ -192,6 +192,8 @@ static const char *_playlist_get_current_media_id(struct _priv *priv)
app_media_info *mi;
mi = _playlist_get_current_media_info(priv);
+ if (!mi)
+ return NULL;
return mi->media_id;
}
diff --git a/src/view/viewer.c b/src/view/viewer.c
index 0a9c597..457e4a1 100644
--- a/src/view/viewer.c
+++ b/src/view/viewer.c
@@ -414,6 +414,8 @@ static const char *_get_current_media_id(struct _priv *priv)
app_media_info *mi;
mi = _get_current_media_info(priv);
+ if (!mi)
+ return NULL;
return mi->media_id;
}