summaryrefslogtreecommitdiffstats
path: root/mp_msg.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-27 10:11:40 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-27 10:11:40 +0000
commitb642c2280ae8f8ef7c1bb8ca8811384c3b50bbfd (patch)
treeb7acf34b13c0e6b81fc9d857e90005dfaef641a4 /mp_msg.c
parent70e10c7436613aed24191043ba265b0cff5790fa (diff)
downloadmpv-b642c2280ae8f8ef7c1bb8ca8811384c3b50bbfd.tar.bz2
mpv-b642c2280ae8f8ef7c1bb8ca8811384c3b50bbfd.tar.xz
Handle mp_msg_charset == NULL correctly in filename_recode.
Patch by Vladimir Voroshilov - voroshil gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22024 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp_msg.c')
-rw-r--r--mp_msg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mp_msg.c b/mp_msg.c
index 593f4caf3a..99c587fb77 100644
--- a/mp_msg.c
+++ b/mp_msg.c
@@ -48,7 +48,8 @@ const char* filename_recode(const char* filename)
static char recoded_filename[MSGSIZE_MAX];
size_t filename_len, max_path;
char* precoded;
- if (!strcasecmp(mp_msg_charset, MSG_CHARSET) ||
+ if (!mp_msg_charset ||
+ !strcasecmp(mp_msg_charset, MSG_CHARSET) ||
!strcasecmp(mp_msg_charset, "noconv"))
return filename;
if (inv_msgiconv == (iconv_t)(-1)) {