From e2a3ea6141dd1db8ef2c0e3c86597e0b3976bc99 Mon Sep 17 00:00:00 2001
From: UKDTOM <tm@orstrand.dk>
Date: Sat, 1 May 2021 23:47:00 +0200
Subject: [PATCH] Fixed #357

---
 CHANGELOG.md                                     | 4 ++++
 package.json                                     | 2 +-
 src/components/modules/ExportTools/scripts/et.js | 9 ++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5ca223..c76b420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ![Logo](https://github.com/WebTools-NG/WebTools-NG/blob/master/src/assets/WebTools-48x48.png) WebTools-ng Change log
 
+## V0.3.8
+
+* [#357 Default "Original Title" to "Title", if empty](https://github.com/WebTools-NG/WebTools-NG/issues/357)
+
 ## V0.3.7
 
 * [#355 ET no output produced](https://github.com/WebTools-NG/WebTools-NG/issues/355)
diff --git a/package.json b/package.json
index d15d5b9..d9a1a64 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "webtools-ng",
   "productName": "WebTools-NG",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "WebTools Next Generation 4 Plex",
   "author": "dane22 & CPSO",
   "license": "MPL-2.0",
diff --git a/src/components/modules/ExportTools/scripts/et.js b/src/components/modules/ExportTools/scripts/et.js
index 6d55984..9c0b091 100644
--- a/src/components/modules/ExportTools/scripts/et.js
+++ b/src/components/modules/ExportTools/scripts/et.js
@@ -803,8 +803,9 @@ const excel2 = new class Excel {
                 case "Original Title":
                     if (wtconfig.get('ET.OrgTitleNull'))
                     {
+                        let compNA = (wtconfig.get('ET.TextQualifierCSV') + wtconfig.get('ET.NotAvail') + wtconfig.get('ET.TextQualifierCSV')).trim();
                         // Override with title if not found
-                        if (val == wtconfig.get('ET.NotAvail'))
+                        if (val == compNA)
                         {
                             retVal = title;
                         }
@@ -819,7 +820,8 @@ const excel2 = new class Excel {
                     if (wtconfig.get('ET.SortTitleNull'))
                     {
                         // Override with title if not found
-                        if (val == wtconfig.get('ET.TextQualifierCSV') + 'undefined' + wtconfig.get('ET.TextQualifierCSV'))
+                        let compNA = (wtconfig.get('ET.TextQualifierCSV') + wtconfig.get('ET.NotAvail') + wtconfig.get('ET.TextQualifierCSV')).trim();
+                        if (val == compNA)
                         {
                             retVal = title;
                         }
@@ -829,7 +831,8 @@ const excel2 = new class Excel {
                     }
                     else
                     {
-                        if (val == wtconfig.get('ET.TextQualifierCSV') + 'undefined' + wtconfig.get('ET.TextQualifierCSV'))
+                        let compNA = (wtconfig.get('ET.TextQualifierCSV') + 'undefined' + wtconfig.get('ET.TextQualifierCSV')).trim();
+                        if (val == compNA)
                         {
                             retVal = wtconfig.get('ET.NotAvail');
                         }