Mercurial > mplayer.hg

changeset 34577:22887c794c02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
In case of a GUI config error, exit MPlayer with error. Additionally, add missing newline to error message and adjust Win32 message level to MSGL_ERR.
author ib
date Thu, 09 Feb 2012 13:25:05 +0000
parents 7596714e9e76
children 948bec0f8df3
files gui/cfg.c gui/win32/wincfg.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui/cfg.c	Thu Feb 09 12:52:09 2012 +0000
+++ b/gui/cfg.c	Thu Feb 09 13:25:05 2012 +0000
@@ -261,8 +261,8 @@
     m_config_register_options(gui_conf, gui_opts);
 
     if (!disable_gui_conf && (m_config_parse_config_file(gui_conf, cfg, 1) < 0)) {
-        gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_ConfigFileError);
-// mplayer(MPLAYER_EXIT_GUI, 1, 0);
+        gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_ConfigFileError "\n");
+        mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
     }
 
     free(cfg);
--- a/gui/win32/wincfg.c	Thu Feb 09 12:52:09 2012 +0000
+++ b/gui/win32/wincfg.c	Thu Feb 09 13:25:05 2012 +0000
@@ -106,7 +106,7 @@
     gui_conf = m_config_new();
     m_config_register_options(gui_conf, gui_opts);
     if (m_config_parse_config_file(gui_conf, cfg, 1) < 0)
-        mp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_ConfigFileError);
+        mp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_ConfigFileError "\n");
     free(cfg);
 }