From 4f2a4d6f8fcd9efab50be67ad4114606a99307bb Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 12 Jun 2019 20:21:41 +0100
Subject: [PATCH] Re-order conditions, remove one if block

---
 source/_partials/talk/video.html.twig | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/source/_partials/talk/video.html.twig b/source/_partials/talk/video.html.twig
index 71be5c818..06e5ef3fb 100644
--- a/source/_partials/talk/video.html.twig
+++ b/source/_partials/talk/video.html.twig
@@ -1,5 +1,8 @@
 {% macro videoSrc(talk) %}
     {# TODO: Cleanup once videos have been added to talks properly. #}
+    {% set videoType = talk.video.type %}
+    {% set videoId = talk.video.id %}
+
     {% if talk.youtube %}
         {% set videoType = 'youtube' %}
         {% set videoId = talk.youtube.id %}
@@ -10,11 +13,6 @@
         {% set videoId = talk.vimeo.id %}
     {% endif %}
 
-    {% if talk.video %}
-        {% set videoType = talk.video.type %}
-        {% set videoId = talk.video.id %}
-    {% endif %}
-
     {% set srcUrls = {
         youtube: '//www.youtube.com/embed',
         videopress: 'https://videopress.com/embed',