summaryrefslogtreecommitdiff
path: root/media_player.c
diff options
context:
space:
mode:
Diffstat (limited to 'media_player.c')
-rw-r--r--media_player.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/media_player.c b/media_player.c
index 1c38e210..f3901fca 100644
--- a/media_player.c
+++ b/media_player.c
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: media_player.c,v 1.67 2009-02-12 10:56:56 phintuka Exp $
+ * $Id: media_player.c,v 1.68 2009-06-02 08:59:45 phintuka Exp $
*
*/
@@ -228,9 +228,10 @@ void cXinelibPlayer::Activate(bool On)
// (those may contain #subtitle, #volnorm etc. directives)
cString mrl;
if(*m_SubFile)
- mrl = cString::sprintf("%s%s#subtitle:%s",
+ mrl = cString::sprintf("%s%s#subtitle:%s%s",
m_File[0] == '/' ? "file:" : "",
*cPlaylist::EscapeMrl(m_File),
+ m_SubFile[0] == '/' ? "file:" : "",
*cPlaylist::EscapeMrl(m_SubFile));
else if((*m_File)[0] == '/')
mrl = cString::sprintf("%s%s",