From 96b339fc07a22f8ffbc8f86411fefd032066a144 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 24 Oct 2014 15:34:39 +0200
Subject: player: disable --force-window if VO fails

Otherwise, it'd retry creating the window all the time.
---
 player/playloop.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/player/playloop.c b/player/playloop.c
index 9f0fb58313..0fc14f9b31 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -837,7 +837,11 @@ void handle_force_window(struct MPContext *mpctx, bool reconfig)
             .w = w,   .h = h,
             .d_w = w, .d_h = h,
         };
-        vo_reconfig(vo, &p, 0);
+        if (vo_reconfig(vo, &p, 0) < 0) {
+            mpctx->opts->force_vo = 0;
+            uninit_video_out(mpctx);
+            return;
+        }
         vo_control(vo, VOCTRL_RESTORE_SCREENSAVER, NULL);
         vo_set_paused(vo, true);
         vo_redraw(vo);
-- 
cgit v1.2.3