From 3a7e2f8bb579e79c72d12d4e84711f4bf8a3f04f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 21 May 2014 14:18:14 +0200
Subject: [PATCH] Allow invoking Journal instruction with non-existing index

This is used by the MG_EscortScholar1 quest.
---
 apps/openmw/mwscript/dialogueextensions.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index a882ae05e..6958084f4 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -34,7 +34,15 @@ namespace MWScript
                     Interpreter::Type_Integer index = runtime[0].mInteger;
                     runtime.pop();
 
-                    MWBase::Environment::get().getJournal()->addEntry (quest, index);
+                    // Invoking Journal with a non-existing index is allowed, and triggers no errors. Seriously? :(
+                    try
+                    {
+                        MWBase::Environment::get().getJournal()->addEntry (quest, index);
+                    }
+                    catch (...)
+                    {
+                        MWBase::Environment::get().getJournal()->setJournalIndex(quest, index);
+                    }
                 }
         };