From 444d6d63f6f059fc831e18a47fe0ef92e7db69db Mon Sep 17 00:00:00 2001
From: Iris Morelle <shadowm@wesnoth.org>
Date: Tue, 4 Sep 2018 16:45:36 -0300
Subject: [PATCH] gui2/unit_create: Use unit type ids as filtering criteria as
 well

---
 changelog.md                    | 3 ++-
 src/gui/dialogs/unit_create.cpp | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changelog.md b/changelog.md
index 4dad8835dd07..dca18d0e50f0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -81,7 +81,8 @@
    * Fixed the debug mode Create Unit dialog crashing when changing the gender
      of the previous selection after causing the list to come up empty using
      the filter box.
-   * Allow searching by race with the Create Unit filter box as well.
+   * Allow searching by race and internal unit type id with the Create Unit
+     filter box as well.
 
 ## Version 1.14.4
  ### Security Fixes
diff --git a/src/gui/dialogs/unit_create.cpp b/src/gui/dialogs/unit_create.cpp
index 974619aa649e..97b6128d6571 100644
--- a/src/gui/dialogs/unit_create.cpp
+++ b/src/gui/dialogs/unit_create.cpp
@@ -238,11 +238,15 @@ void unit_create::filter_text_changed(text_box_base* textbox, const std::string&
 			label& race_label
 					= find_widget<label>(*it, "race", false);
 
+			assert(i < units_.size());
+			const std::string& unit_type_id = units_[i] ? units_[i]->id() : "";
+
 			bool found = false;
 			for(const auto & word : words)
 			{
 				found = ci_search(type_label.get_label().str(), word) ||
-				        ci_search(race_label.get_label().str(), word);
+				        ci_search(race_label.get_label().str(), word) ||
+				        ci_search(unit_type_id, word);
 
 				if(!found) {
 					// one word doesn't match, we don't reach words.end()