summaryrefslogtreecommitdiffstats
path: root/libmenu
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-02 01:43:40 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-02-02 01:43:40 +0000
commit95d4edb1b0e81bcdfdad33738181d28b75f251cb (patch)
tree2c9fa9f8dbbeb13666b95c3c464e0959fdec4eae /libmenu
parent3591e28c3730858d8c8e8dff57f64ff036c7ab3a (diff)
downloadmpv-95d4edb1b0e81bcdfdad33738181d28b75f251cb.tar.bz2
mpv-95d4edb1b0e81bcdfdad33738181d28b75f251cb.tar.xz
Fixes a problem where the menu won't work, if you just use freetype fonts
and have no font.desc. patch by Andreas Hess <jaska@gmx.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9213 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu')
-rw-r--r--libmenu/menu.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmenu/menu.c b/libmenu/menu.c
index 616220dfdb..dc538afa47 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -117,8 +117,10 @@ int menu_init(char* cfg_file) {
char* buffer = NULL;
int bl = BUF_STEP, br = 0;
int f, fd;
+#ifndef HAVE_FREETYPE
if(vo_font == NULL)
return 0;
+#endif
fd = open(cfg_file, O_RDONLY);
if(fd < 0) {
printf("Can't open menu config file: %s\n",cfg_file);