From 42e70868ab24b16189924a26efd5bfdc0b960e8a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 23 Feb 2014 18:07:13 +0100
Subject: dvd: check for empty DVD volume ID

The only DVD sample I have just returns an empty string for this. Let
command.c use the filename if the ID is empty.
---
 stream/stream_dvdnav.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'stream/stream_dvdnav.c')

diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 537047fe04..887b112d70 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -604,7 +604,9 @@ static int control(stream_t *stream, int cmd, void *arg)
     }
     case STREAM_CTRL_GET_DVD_VOLUME_ID: {
         const char *volume = NULL;
-        if (dvdnav_get_title_string(dvdnav, &volume) != DVDNAV_STATUS_OK || !volume)
+        if (dvdnav_get_title_string(dvdnav, &volume) != DVDNAV_STATUS_OK)
+            return STREAM_ERROR;
+        if (!volume || !volume[0])
             return STREAM_ERROR;
         *(char**)arg = talloc_strdup(NULL, volume);
         return STREAM_OK;
-- 
cgit v1.2.3