Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sim GUI: Fix crash when field/robot image load is canceled (#2362)

Browse Source
This commit is contained in:
Peter Johnson
2020-02-15 09:53:21 -08:00
committed by GitHub
parent 7275ab9837
commit 31f4fd70ce
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
simulation/halsim_gui/src/main/native/cpp/Field2D.cpp
View File

@@ -176,14 +176,17 @@ void FieldInfo::Reset() {
void FieldInfo::LoadImage() {
if (m_fileOpener && m_fileOpener->ready(0)) {
if (wpi::StringRef(m_fileOpener->result()[0]).endswith(".json")) {
LoadJson(m_fileOpener->result()[0]);
} else {
LoadImageImpl(m_fileOpener->result()[0]);
m_top = 0;
m_left = 0;
m_bottom = -1;
m_right = -1;
auto result = m_fileOpener->result();
if (!result.empty()) {
if (wpi::StringRef(result[0]).endswith(".json")) {
LoadJson(result[0]);
} else {
LoadImageImpl(result[0]);
m_top = 0;
m_left = 0;
m_bottom = -1;
m_right = -1;
}
}
m_fileOpener.reset();
}
@@ -382,7 +385,8 @@ void RobotInfo::Reset() {
void RobotInfo::LoadImage() {
if (m_fileOpener && m_fileOpener->ready(0)) {
LoadImageImpl(m_fileOpener->result()[0]);
auto result = m_fileOpener->result();
if (!result.empty()) LoadImageImpl(result[0]);
m_fileOpener.reset();
}
if (m_texture == 0 && !m_filename.empty()) {