From ac3919f56c171c58d1f8f5b7ac022e1895627800 Mon Sep 17 00:00:00 2001 From: coderhyme Date: Thu, 7 Sep 2017 14:22:38 +0900 Subject: [PATCH] [MediaContent] Fixed the MediaInfo.ThumbnailPath property to return null instead of an empty string when the raw data is null. Change-Id: I8fb26b638937b1377bce0ef5a19dc79c8c07a4a0 Signed-off-by: coderhyme --- .../Tizen.Content.MediaContent/InteropHelper.cs | 4 ++-- .../Tizen.Content.MediaContent/MediaInfo.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/InteropHelper.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/InteropHelper.cs index 1d9d933..e40b1f5 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/InteropHelper.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/InteropHelper.cs @@ -23,7 +23,7 @@ namespace Tizen.Content.MediaContent { internal delegate MediaContentError GetStringFunc(T handle, out IntPtr value); - internal static string GetString(T handle, GetStringFunc func) + internal static string GetString(T handle, GetStringFunc func, bool nullable = false) { IntPtr val = IntPtr.Zero; try @@ -32,7 +32,7 @@ namespace Tizen.Content.MediaContent if (val == IntPtr.Zero) { - return string.Empty; + return nullable ? null : string.Empty; } return Marshal.PtrToStringAnsi(val); diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs index 0072d38..8705d6b 100644 --- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs +++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/MediaInfo.cs @@ -43,7 +43,7 @@ namespace Tizen.Content.MediaContent DateModified = InteropHelper.GetDateTime(handle, Interop.MediaInfo.GetModifiedTime); Timeline = InteropHelper.GetDateTime(handle, Interop.MediaInfo.GetTimeline); - ThumbnailPath = InteropHelper.GetString(handle, Interop.MediaInfo.GetThumbnailPath); + ThumbnailPath = InteropHelper.GetString(handle, Interop.MediaInfo.GetThumbnailPath, true); Description = InteropHelper.GetString(handle, Interop.MediaInfo.GetDescription); Longitude = InteropHelper.GetValue(handle, Interop.MediaInfo.GetLongitude); -- 2.7.4