openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Don't crash when canceling scenario import pick (#308)

Browse Source
This commit is contained in:
Nat Quayle Nelson
2023-01-13 17:23:28 -07:00
committed by GitHub
parent 2d6a5cae5e
commit 7055d5eba4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scenedit/scen.townout.cpp
View File

@@ -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)