reset errorhandler context

apps/openmw/mwscript/scriptmanagerimp.cpp

@@ -171,7 +171,7 @@ namespace MWScript
         {
             Compiler::Locals locals;
 
-            mErrorHandler.setContext(name2 + "[local variables]");
+            Compiler::ContextRestore restore = mErrorHandler.setContext(name2 + "[local variables]", true);
 
             std::istringstream stream (script->mScriptText);
             Compiler::QuickFileParser parser (mErrorHandler, mCompilerContext, locals);

components/compiler/streamerrorhandler.cpp

@@ -56,10 +56,25 @@ namespace Compiler
         Log(logLevel) << text.str();
     }
 
-    void StreamErrorHandler::setContext(const std::string &context)
+    ContextRestore StreamErrorHandler::setContext(const std::string &context, bool restore)
     {
+        if (!restore)
+        {
+            mContext = context;
+            return {nullptr, {}};
+        }
+        ContextRestore restorer(this, mContext);
         mContext = context;
+        return restorer;
     }
 
     StreamErrorHandler::StreamErrorHandler()  {}
+
+    ContextRestore::ContextRestore(StreamErrorHandler* handler, const std::string& context) : mHandler(handler), mContext(context) {}
+
+    ContextRestore::~ContextRestore()
+    {
+        if(mHandler)
+            mHandler->setContext(mContext);
+    }
 }

components/compiler/streamerrorhandler.hpp

@@ -7,6 +7,7 @@
 
 namespace Compiler
 {
+    class ContextRestore;
     /// \brief Error handler implementation: Write errors into logging stream
 
     class StreamErrorHandler : public ErrorHandler
@@ -26,13 +27,23 @@ namespace Compiler
 
         public:
 
-            void setContext(const std::string& context);
+            ContextRestore setContext(const std::string& context, bool restore = false);
 
         // constructors
 
             StreamErrorHandler ();
             ///< constructor
     };
+
+    class ContextRestore
+    {
+            StreamErrorHandler* mHandler;
+            const std::string mContext;
+        public:
+            ContextRestore (StreamErrorHandler* handler, const std::string& context);
+
+            ~ContextRestore();
+    };
 }
 
 #endif