eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 01:59:19 +02:00
Code Issues 121 Wiki Activity

fix scenery_list crashes when missing vehicles

Browse Source
This commit is contained in:
milek7
2023-05-28 21:25:05 +02:00
parent 54e5e186a3
commit b01c19308c
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
launcher/scenery_list.cpp
View File

@@ -216,14 +216,17 @@ void ui::scenerylist_panel::render_contents()
void ui::scenerylist_panel::draw_summary_tooltip(const dynamic_desc &dyn_desc) void ui::scenerylist_panel::draw_summary_tooltip(const dynamic_desc &dyn_desc)
{ {
std::string name = (dyn_desc.vehicle->path.parent_path() / dyn_desc.vehicle->path.stem()).string(); if (dyn_desc.vehicle && dyn_desc.skin)
std::string skin = dyn_desc.skin->skin; {
ImGui::Text(STR_C("ID: %s"), dyn_desc.name.c_str()); std::string name = (dyn_desc.vehicle->path.parent_path() / dyn_desc.vehicle->path.stem()).string();
ImGui::NewLine(); std::string skin = dyn_desc.skin->skin;
ImGui::Text(STR_C("ID: %s"), dyn_desc.name.c_str());
ImGui::NewLine();
ImGui::Text(STR_C("Type: %s"), name.c_str()); ImGui::Text(STR_C("Type: %s"), name.c_str());
ImGui::Text(STR_C("Skin: %s"), skin.c_str()); ImGui::Text(STR_C("Skin: %s"), skin.c_str());
ImGui::NewLine(); ImGui::NewLine();
}
if (dyn_desc.drivertype != "nobody") if (dyn_desc.drivertype != "nobody")
ImGui::Text(STR_C("Occupied: %s"), dyn_desc.drivertype.c_str()); ImGui::Text(STR_C("Occupied: %s"), dyn_desc.drivertype.c_str());
@@ -366,24 +369,26 @@ void ui::dynamic_edit_popup::render_content()
STRN("nobody") STRN("nobody")
}; };
std::string name = (dynamic.vehicle->path.parent_path() / dynamic.vehicle->path.stem()).string();
ImGui::Text(STR_C("Type: %s"), name.c_str());
ImGui::NewLine();
if (ImGui::InputText(STR_C("Name"), name_buf.data(), name_buf.size())) if (ImGui::InputText(STR_C("Name"), name_buf.data(), name_buf.size()))
dynamic.name = name_buf.data(); dynamic.name = name_buf.data();
if (ImGui::BeginCombo(STR_C("Skin"), dynamic.skin->skin.c_str(), ImGuiComboFlags_HeightLargest)) if (dynamic.vehicle && dynamic.skin)
{ {
for (auto const &skin : dynamic.vehicle->matching_skinsets) { std::string name = (dynamic.vehicle->path.parent_path() / dynamic.vehicle->path.stem()).string();
bool is_selected = (skin == dynamic.skin);
if (ImGui::Selectable(skin->skin.c_str(), is_selected)) ImGui::Text(STR_C("Type: %s"), name.c_str());
dynamic.skin = skin;
if (is_selected) if (ImGui::BeginCombo(STR_C("Skin"), dynamic.skin->skin.c_str(), ImGuiComboFlags_HeightLargest))
ImGui::SetItemDefaultFocus(); {
for (auto const &skin : dynamic.vehicle->matching_skinsets) {
bool is_selected = (skin == dynamic.skin);
if (ImGui::Selectable(skin->skin.c_str(), is_selected))
dynamic.skin = skin;
if (is_selected)
ImGui::SetItemDefaultFocus();
}
ImGui::EndCombo();
} }
ImGui::EndCombo();
} }
if (ImGui::BeginCombo(STR_C("Occupancy"), Translations.lookup_c(dynamic.drivertype.c_str()))) if (ImGui::BeginCombo(STR_C("Occupancy"), Translations.lookup_c(dynamic.drivertype.c_str())))