From cdfa2530b6d0cff978c6552ee0032a6656c12189 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 6 May 2017 01:22:17 +0200
Subject: [PATCH] Ref T72, lenient search for airline ICAO

---
 src/blackgui/filters/airlineicaofilterbar.ui | 10 +---------
 src/blackgui/models/airlineicaofilter.cpp    | 10 +++++++++-
 src/blackgui/models/airlineicaofilter.h      |  5 ++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/blackgui/filters/airlineicaofilterbar.ui b/src/blackgui/filters/airlineicaofilterbar.ui
index 3d49d48c4..15f5946c4 100644
--- a/src/blackgui/filters/airlineicaofilterbar.ui
+++ b/src/blackgui/filters/airlineicaofilterbar.ui
@@ -2,16 +2,8 @@
 <ui version="4.0">
  <class>CAirlineIcaoFilterBar</class>
  <widget class="QFrame" name="CAirlineIcaoFilterBar">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>492</width>
-    <height>22</height>
-   </rect>
-  </property>
   <property name="windowTitle">
-   <string>Frame</string>
+   <string>Airline ICAO filter</string>
   </property>
   <property name="frameShape">
    <enum>QFrame::StyledPanel</enum>
diff --git a/src/blackgui/models/airlineicaofilter.cpp b/src/blackgui/models/airlineicaofilter.cpp
index fdb6f45b6..590d2ea38 100644
--- a/src/blackgui/models/airlineicaofilter.cpp
+++ b/src/blackgui/models/airlineicaofilter.cpp
@@ -33,7 +33,15 @@ namespace BlackGui
             {
                 if (!m_vDesignator.isEmpty())
                 {
-                    if (!this->stringMatchesFilterExpression(icao.getVDesignator(), m_vDesignator)) { continue; }
+                    // based on T72, also find VLHA based on LHA
+                    if (m_vDesignator.length() == 4)
+                    {
+                        if (!this->stringMatchesFilterExpression(icao.getVDesignator(), m_vDesignator)) { continue; }
+                    }
+                    else
+                    {
+                        if (!this->stringMatchesFilterExpression(icao.getDesignator(), m_vDesignator)) { continue; }
+                    }
                 }
 
                 if (!this->m_name.isEmpty())
diff --git a/src/blackgui/models/airlineicaofilter.h b/src/blackgui/models/airlineicaofilter.h
index 8dab4e058..869961af3 100644
--- a/src/blackgui/models/airlineicaofilter.h
+++ b/src/blackgui/models/airlineicaofilter.h
@@ -37,10 +37,9 @@ namespace BlackGui
             QString m_vDesignator;
             QString m_name;
             QString m_countryIso;
-            bool m_real;
-            bool m_va;
+            bool m_real = false;
+            bool m_va = false;
         };
-
     } // namespace
 } // namespace