Mercurial > mplayer.hg

changeset 35801:98693cc5df48

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Exit GUI if we can't return to the skin we started with. If there are errors in both the selected skin and the skin we started with, there's nothing we can do but exit.
author ib
date Sat, 26 Jan 2013 00:34:43 +0000
parents 6a7be705643b
children 2849b02700e5
files gui/ui/actions.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/actions.c	Sat Jan 26 00:17:08 2013 +0000
+++ b/gui/ui/actions.c	Sat Jan 26 00:34:43 2013 +0000
@@ -597,8 +597,8 @@
 
     if (skinRead(name) != 0) {
         if (skinRead(skinName) != 0) {
-            mainVisible = True;
-            return;
+            gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_SKIN_SKINCFG_SkinCfgError, skinName);
+            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
         }
     }