From 659a8ba279e1affc6ef954c4cbae9ba76eea92cb Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ayers@gmail.com>
Date: Tue, 24 Feb 2015 21:10:01 -0600
Subject: [PATCH] Correction to teleportation changes.

OMW Bug #2400
Related to OMW Bug #1533

Don't crash on confiscating items if a prison marker cannot be found.
---
 apps/openmw/mwworld/worldimp.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 4cafab41d..fe56fc3bb 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -3075,6 +3075,11 @@ namespace MWWorld
     void World::confiscateStolenItems(const Ptr &ptr)
     {
         MWWorld::Ptr prisonMarker = getClosestMarker( ptr, "prisonmarker" );
+        if ( prisonMarker.isEmpty() )
+        {
+            std::cerr << "Failed to confiscate items: no closest prison marker found." << std::endl;
+            return;
+        }
         std::string prisonName = prisonMarker.mRef->mRef.getDestCell();
         if ( prisonName.empty() )
         {