From 7055d5eba436e9979a7c7bf7f8e5f6a6d970cbeb Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Fri, 13 Jan 2023 17:23:28 -0700 Subject: [PATCH] Don't crash when canceling scenario import pick (#308) --- src/scenedit/scen.townout.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/scenedit/scen.townout.cpp b/src/scenedit/scen.townout.cpp index 24697fb2..a0588218 100644 --- a/src/scenedit/scen.townout.cpp +++ b/src/scenedit/scen.townout.cpp @@ -1361,6 +1361,7 @@ void delete_last_town() { cTown* pick_import_town() { cScenario temp_scenario; fs::path path = nav_get_scenario(); + if(path.empty()) return nullptr; load_scenario(path, temp_scenario); short town_num = pick_town_num("select-import-town", 0, temp_scenario); if(town_num < 0) return nullptr; @@ -1526,6 +1527,7 @@ bool resize_outdoors() { cOutdoors* pick_import_out() { cScenario temp_scenario; fs::path path = nav_get_scenario(); + if(path.empty()) return nullptr; load_scenario(path, temp_scenario); location sector = pick_out({-1,-1},temp_scenario); if(sector.x < 0 && sector.y < 0)