From a3c9a513af4e0ecd9d137a8d90d420daae5c49f7 Mon Sep 17 00:00:00 2001 From: Ted John Date: Tue, 4 May 2021 21:05:40 +0100 Subject: [PATCH] Fix load/save of research in editor --- src/openrct2/Editor.cpp | 2 -- src/openrct2/management/Research.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index dcb7d70789..3a165588e5 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -358,8 +358,6 @@ namespace Editor gGuestChangeModifier = 0; if (fromSave) { - research_populate_list_random(); - if (gParkFlags & PARK_FLAGS_NO_MONEY) { gParkFlags |= PARK_FLAGS_NO_MONEY_SCENARIO; diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index 4f5f2e5e45..a90abb7cc8 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -394,6 +394,12 @@ void research_reset_current_item() */ static void research_insert_unresearched(ResearchItem&& item) { + // First check to make sure that entry is not already accounted for + if (item.Exists()) + { + return; + } + gResearchItemsUninvented.push_back(std::move(item)); }