Fix mutation examine window crash (#71410)

* Fix mutation examine window crash Fixes #71237 * Apply suggestions from code review Style fixes Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · May 20, 2024 · c030a0c · c030a0c
1 parent e8f7249
commit c030a0c
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/mutation_ui.cpp b/src/mutation_ui.cpp
@@ -49,14 +49,14 @@ static const auto shortcut_desc = []( const std::string_view comment, const std:
 
 // needs extensive improvement
 
-static trait_id GetTrait( const std::vector<trait_id> &active,
-                          const std::vector<trait_id> &passive,
-                          int cursor, mutation_tab_mode tab_mode )
+static std::optional<trait_id> GetTrait( const std::vector<trait_id> &active,
+        const std::vector<trait_id> &passive,
+        int cursor, mutation_tab_mode tab_mode )
 {
-    trait_id mut_id;
+    std::optional<trait_id> mut_id;
     if( tab_mode == mutation_tab_mode::active ) {
         mut_id = active[cursor];
-    } else {
+    } else if( tab_mode == mutation_tab_mode::passive ) {
         mut_id = passive[cursor];
     }
     return mut_id;