From 4762a9521662527551cbb360d7ae6404638bfa56 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sun, 17 Sep 2017 19:18:52 +0200
Subject: [PATCH] Avoid unnecessary JSON exceptions

---
 src/blackgui/editors/aircrafticaoform.cpp | 1 +
 src/blackgui/editors/airlineicaoform.cpp  | 3 ++-
 src/blackgui/editors/liveryform.cpp       | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/blackgui/editors/aircrafticaoform.cpp b/src/blackgui/editors/aircrafticaoform.cpp
index f75852598..811fc6cbf 100644
--- a/src/blackgui/editors/aircrafticaoform.cpp
+++ b/src/blackgui/editors/aircrafticaoform.cpp
@@ -92,6 +92,7 @@ namespace BlackGui
 
         void CAircraftIcaoForm::jsonPasted(const QString &json)
         {
+            if (json.isEmpty()) { return; } // avoid unnecessary conversions
             try
             {
                 CVariant jsonVariant;
diff --git a/src/blackgui/editors/airlineicaoform.cpp b/src/blackgui/editors/airlineicaoform.cpp
index 54db9ead7..6c9495203 100644
--- a/src/blackgui/editors/airlineicaoform.cpp
+++ b/src/blackgui/editors/airlineicaoform.cpp
@@ -157,6 +157,7 @@ namespace BlackGui
 
         void CAirlineIcaoForm::jsonPasted(const QString &json)
         {
+            if (json.isEmpty()) { return; } // avoid unnecessary conversions
             try
             {
                 CVariant jsonVariant;
@@ -183,7 +184,7 @@ namespace BlackGui
             }
             else if (variantDropped.canConvert<CAirlineIcaoCodeList>())
             {
-                CAirlineIcaoCodeList icaoList(variantDropped.value<CAirlineIcaoCodeList>());
+                const CAirlineIcaoCodeList icaoList(variantDropped.value<CAirlineIcaoCodeList>());
                 if (icaoList.isEmpty()) { return;  }
                 icao =  icaoList.front();
             }
diff --git a/src/blackgui/editors/liveryform.cpp b/src/blackgui/editors/liveryform.cpp
index 6963a7f61..b4cfeb9ab 100644
--- a/src/blackgui/editors/liveryform.cpp
+++ b/src/blackgui/editors/liveryform.cpp
@@ -115,6 +115,7 @@ namespace BlackGui
 
         void CLiveryForm::jsonPasted(const QString &json)
         {
+            if (json.isEmpty()) { return; } // avoid unnecessary conversions
             try
             {
                 CVariant jsonVariant;