From 9123c7a7878d6cddd0b879954e28e1a13f243d97 Mon Sep 17 00:00:00 2001
From: Macron1Robot <macron1robot@yandex.ru>
Date: Fri, 25 Apr 2014 01:06:14 +0400
Subject: [PATCH] Fix for map tavern (video set to standard)

---
 client/GUIClasses.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/GUIClasses.cpp b/client/GUIClasses.cpp
index bf1dfed83..3fe656c5c 100644
--- a/client/GUIClasses.cpp
+++ b/client/GUIClasses.cpp
@@ -3742,8 +3742,10 @@ CTavernWindow::CTavernWindow(const CGObjectInstance *TavernObj):
 		if(selected == -1)
 			recruit->block(true);
 	}
-    CCS->videoh->open(LOCPLINT->castleInt->town->town->clientInfo.tavernVideo);
-
+	if (LOCPLINT->castleInt && LOCPLINT->castleInt->town->town->clientInfo.tavernVideo!="")
+		CCS->videoh->open(LOCPLINT->castleInt->town->town->clientInfo.tavernVideo);
+	else
+		CCS->videoh->open("TAVERN.BIK");
 }
 
 void CTavernWindow::recruitb()