From d210c14167a5d0848bfebec093b03535c65bbfbb Mon Sep 17 00:00:00 2001
From: wandererfan <wandererfan@gmail.com>
Date: Fri, 20 Mar 2020 14:09:23 -0400
Subject: [PATCH] [TD]GeomHatch - handle empty parameter

---
 src/Mod/TechDraw/App/DrawGeomHatch.cpp | 6 ++++++
 src/Mod/TechDraw/Gui/TaskGeomHatch.cpp | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Mod/TechDraw/App/DrawGeomHatch.cpp b/src/Mod/TechDraw/App/DrawGeomHatch.cpp
index ac319d6766..f6b78adde1 100644
--- a/src/Mod/TechDraw/App/DrawGeomHatch.cpp
+++ b/src/Mod/TechDraw/App/DrawGeomHatch.cpp
@@ -615,6 +615,9 @@ std::string DrawGeomHatch::prefGeomHatchFile(void)
     std::string defaultDir = App::Application::getResourceDir() + "Mod/TechDraw/PAT/";
     std::string defaultFileName = defaultDir + "FCPAT.pat";
     std::string result = hGrp->GetASCII("FilePattern", defaultFileName.c_str());
+    if (result.empty()) {
+        result = defaultFileName;
+    }
     return result;
 }
 
@@ -624,6 +627,9 @@ std::string DrawGeomHatch::prefGeomHatchName()
         .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/PAT");
     std::string defaultNamePattern = "Diamond";
     std::string result = hGrp->GetASCII("NamePattern",defaultNamePattern.c_str());
+    if (result.empty()) {
+        result = defaultNamePattern;
+    }
     return result;
 }
 
diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp
index 31b3cddbd1..2c48a4c968 100644
--- a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp
+++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp
@@ -82,7 +82,7 @@ void TaskGeomHatch::initUi()
     if (nameIndex > -1) {
         ui->cbName->setCurrentIndex(nameIndex);
     } else {
-        Base::Console().Warning("Warning - Pattern name not found in current PAT File\n");
+        Base::Console().Warning("Warning - Pattern name *%s* not found in current PAT File\n", m_name.c_str());
     }
     ui->sbScale->setValue(m_scale);
     ui->sbWeight->setValue(m_weight);