[vlc-devel] [PATCH 2/3] vout: decklink: only set the vd->sys when everything is OK

[Steve Lhomme]

---
 modules/video_output/decklink.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp
index 207aa72c5b..c512b2b6fe 100644
--- a/modules/video_output/decklink.cpp
+++ b/modules/video_output/decklink.cpp
@@ -778,8 +778,6 @@ static int OpenVideo(vout_display_t *vd, const vout_display_cfg_t *cfg,
     if(!sys)
         return VLC_ENOMEM;
 
-    vd->sys = (vout_display_sys_t*) sys;
-
     bool b_init;
     vlc_mutex_lock(&sys->lock);
     b_init = !sys->b_recycling;
@@ -817,6 +815,8 @@ static int OpenVideo(vout_display_t *vd, const vout_display_cfg_t *cfg,
     vd->display = NULL;
     vd->control = ControlVideo;
 
+    vd->sys = (vout_display_sys_t*) sys;
+
     return VLC_SUCCESS;
 }
 
-- 
2.17.1