# HG changeset patch
# User filon
# Date 1041542570 0
# Node ID 48a2c2545d5caff2cece141d31f1b5458e65a3da
# Parent  86c0d90cd841296fd7260dc414425649711417d4
Use system-wide menu.conf file if nothing else is availible,
also always try first to fallback to user configuration file.

diff -r 86c0d90cd841 -r 48a2c2545d5c mplayer.c
--- a/mplayer.c	Thu Jan 02 18:54:16 2003 +0000
+++ b/mplayer.c	Thu Jan 02 21:22:50 2003 +0000
@@ -968,12 +968,20 @@
 
 #ifdef HAVE_MENU
  if(use_menu) {
-   if(!menu_cfg) menu_cfg = get_path("menu.conf");
-   if(menu_init(menu_cfg))
-     mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited\n");
+   if(menu_cfg && menu_init(menu_cfg))
+     mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", menu_cfg);
    else {
-     mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu init failed\n");
-     use_menu = 0;
+     menu_cfg = get_path("menu.conf");
+     if(menu_init(menu_cfg))
+       mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", menu_cfg);
+     else {
+       if(menu_init(CONFDIR"/menu.conf"))
+         mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu inited: %s\n", CONFDIR"/menu.conf");
+       else {
+         mp_msg(MSGT_CPLAYER,MSGL_INFO,"Menu init failed\n");
+         use_menu = 0;
+       }
+     }
    }
  }
 #endif