From 8eacc3582c80982e81dc003c24878c330bbf4d83 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Sat, 5 May 2018 11:12:45 +0100
Subject: [PATCH] Remove PlainContext

---
 src/openrct2-ui/input/KeyboardShortcuts.cpp |  5 ++++
 src/openrct2-ui/input/KeyboardShortcuts.h   |  1 +
 src/openrct2/Context.cpp                    | 26 +--------------------
 3 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/openrct2-ui/input/KeyboardShortcuts.cpp b/src/openrct2-ui/input/KeyboardShortcuts.cpp
index 41f2372518..dda93d267e 100644
--- a/src/openrct2-ui/input/KeyboardShortcuts.cpp
+++ b/src/openrct2-ui/input/KeyboardShortcuts.cpp
@@ -38,6 +38,11 @@ KeyboardShortcuts::KeyboardShortcuts(const std::shared_ptr<IPlatformEnvironment>
     _instance = this;
 }
 
+KeyboardShortcuts::~KeyboardShortcuts()
+{
+    _instance = nullptr;
+}
+
 void KeyboardShortcuts::Reset()
 {
     for (size_t i = 0; i < SHORTCUT_COUNT; i++)
diff --git a/src/openrct2-ui/input/KeyboardShortcuts.h b/src/openrct2-ui/input/KeyboardShortcuts.h
index 7c7df5893b..205bcdee45 100644
--- a/src/openrct2-ui/input/KeyboardShortcuts.h
+++ b/src/openrct2-ui/input/KeyboardShortcuts.h
@@ -125,6 +125,7 @@ namespace OpenRCT2
 
         public:
             KeyboardShortcuts(const std::shared_ptr<IPlatformEnvironment>& env);
+            ~KeyboardShortcuts();
 
             void Reset();
             bool Load();
diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index 1d52cedca6..0a3468b6ee 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -918,35 +918,11 @@ namespace OpenRCT2
         }
     };
 
-    class PlainContext final : public Context
-    {
-        std::shared_ptr<IPlatformEnvironment> _env;
-        std::shared_ptr<IAudioContext> _audioContext;
-        std::shared_ptr<IUiContext> _uiContext;
-
-    public:
-        PlainContext()
-            : PlainContext(CreatePlatformEnvironment(), CreateDummyAudioContext(), CreateDummyUiContext())
-        {
-        }
-
-        PlainContext(
-            const std::shared_ptr<IPlatformEnvironment>& env,
-            const std::shared_ptr<IAudioContext>& audioContext,
-            const std::shared_ptr<IUiContext>& uiContext)
-            : Context(env, audioContext, uiContext),
-              _env(env),
-              _audioContext(audioContext),
-              _uiContext(uiContext)
-        {
-        }
-    };
-
     Context * Context::Instance = nullptr;
 
     std::unique_ptr<IContext> CreateContext()
     {
-        return std::make_unique<PlainContext>();
+        return std::make_unique<Context>(CreatePlatformEnvironment(), CreateDummyAudioContext(), CreateDummyUiContext());
     }
 
     std::unique_ptr<IContext> CreateContext(