From e5ce3859a3c7e88edb0a2d06e29d3dc135aa0aba Mon Sep 17 00:00:00 2001
From: "Christian F. Coors" <ccoors@users.noreply.github.com>
Date: Tue, 17 Oct 2017 22:31:05 +0200
Subject: [PATCH] Fix Intent pointers/strings

---
 src/openrct2-ui/windows/LoadSave.cpp         | 4 +++-
 src/openrct2/windows/EditorBottomToolbar.cpp | 4 +++-
 src/openrct2/windows/TopToolbar.cpp          | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp
index 71ef351fce..4f64a8a080 100644
--- a/src/openrct2-ui/windows/LoadSave.cpp
+++ b/src/openrct2-ui/windows/LoadSave.cpp
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <string>
+
 #include <openrct2/config/Config.h>
 #include <openrct2/title/TitleScreen.h>
 #include <openrct2/core/Memory.hpp>
@@ -836,7 +838,7 @@ static void window_loadsave_select(rct_window *w, const char *path)
     {
         save_path(&gConfigGeneral.last_save_track_directory, pathBuffer);
         auto intent = Intent(WC_INSTALL_TRACK);
-        intent.putExtra(INTENT_EXTRA_PATH, pathBuffer);
+        intent.putExtra(INTENT_EXTRA_PATH, std::string { pathBuffer });
         context_open_intent(&intent);
         window_close_by_class(WC_LOADSAVE);
         window_loadsave_invoke_callback(MODAL_RESULT_OK, pathBuffer);
diff --git a/src/openrct2/windows/EditorBottomToolbar.cpp b/src/openrct2/windows/EditorBottomToolbar.cpp
index 02cc996837..0d3cd2b46c 100644
--- a/src/openrct2/windows/EditorBottomToolbar.cpp
+++ b/src/openrct2/windows/EditorBottomToolbar.cpp
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <string>
+
 #include "../Context.h"
 #include "../OpenRCT2.h"
 
@@ -292,7 +294,7 @@ void window_editor_bottom_toolbar_jump_forward_to_save_scenario()
     window_close_all();
     auto intent = Intent(WC_LOADSAVE);
     intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_SAVE | LOADSAVETYPE_SCENARIO);
-    intent.putExtra(INTENT_EXTRA_PATH, gS6Info.name);
+    intent.putExtra(INTENT_EXTRA_PATH, std::string { gS6Info.name });
     context_open_intent(&intent);
 }
 
diff --git a/src/openrct2/windows/TopToolbar.cpp b/src/openrct2/windows/TopToolbar.cpp
index 17f69f05ac..f1851bd032 100644
--- a/src/openrct2/windows/TopToolbar.cpp
+++ b/src/openrct2/windows/TopToolbar.cpp
@@ -14,6 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
+#include <string>
+
 #include "../config/Config.h"
 #include "../Context.h"
 #include "../OpenRCT2.h"
@@ -560,7 +562,7 @@ static void window_top_toolbar_dropdown(rct_window *w, rct_widgetindex widgetInd
             if (gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) {
                 auto intent = Intent(WC_LOADSAVE);
                 intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_SAVE | LOADSAVETYPE_LANDSCAPE);
-                intent.putExtra(INTENT_EXTRA_PATH, gS6Info.name);
+                intent.putExtra(INTENT_EXTRA_PATH, std::string { gS6Info.name });
                 context_open_intent(&intent);
             }
             else {