From 9e72e51bab31e34d45451c6833f85405325f8930 Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 11 May 2018 18:51:04 +0100 Subject: [PATCH] Use std::unique_ptr for discord service --- src/openrct2/Context.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 0a3468b6ee..f2cb2d08b9 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -94,7 +94,7 @@ namespace OpenRCT2 ITrackDesignRepository * _trackDesignRepository = nullptr; IScenarioRepository * _scenarioRepository = nullptr; #ifdef __ENABLE_DISCORD__ - DiscordService * _discordService = nullptr; + std::unique_ptr _discordService; #endif StdInOutConsole _stdInOutConsole; @@ -145,9 +145,6 @@ namespace OpenRCT2 delete _titleScreen; -#ifdef __ENABLE_DISCORD__ - delete _discordService; -#endif delete _scenarioRepository; delete _trackDesignRepository; delete _objectManager; @@ -354,7 +351,7 @@ namespace OpenRCT2 _trackDesignRepository = CreateTrackDesignRepository(_env); _scenarioRepository = CreateScenarioRepository(_env); #ifdef __ENABLE_DISCORD__ - _discordService = new DiscordService(); + _discordService = std::make_unique(); #endif try