From 2588d0701a39777fc35528b6770bc8641eadf257 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Tue, 21 Jul 2020 14:31:09 +0200
Subject: [PATCH] Coverity: [skip ci] Dereference before null check

---
 src/Mod/TechDraw/Gui/TaskLeaderLine.cpp | 9 ++++-----
 src/Mod/TechDraw/Gui/TaskRichAnno.cpp   | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
index a2e4e59ff2..a3f56ac17a 100644
--- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
+++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp
@@ -134,8 +134,7 @@ TaskLeaderLine::TaskLeaderLine(TechDrawGui::ViewProviderLeader* leadVP) :
     }
 
     //TODO: when/if leaders are allowed to be parented to Page, check for m_baseFeat will be removed
-    if ( (m_lineFeat == nullptr) ||
-         (m_baseFeat == nullptr) ||
+    if ( (m_baseFeat == nullptr) ||
          (m_basePage == nullptr) ) {
         Base::Console().Error("TaskLeaderLine - bad parameters (2).  Can not proceed.\n");
         return;
@@ -442,9 +441,9 @@ void TaskLeaderLine::createLeaderFeature(std::vector<Base::Vector3d> converted)
     if (m_baseFeat != nullptr) {
         m_baseFeat->touch();
     }
-    if (m_basePage != nullptr) {
-        m_basePage->touch();
-    }
+
+    m_basePage->touch();
+
     if (m_lineFeat != nullptr) {
         m_lineFeat->requestPaint();
     }
diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
index ea0c5cc192..88c3fd8f5e 100644
--- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
+++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp
@@ -403,9 +403,9 @@ void TaskRichAnno::createAnnoFeature()
     if (m_baseFeat != nullptr) {
         m_baseFeat->touch();
     }
-    if (m_basePage != nullptr) {
-        m_basePage->touch();
-    }
+
+    m_basePage->touch();
+
     if (m_annoFeat != nullptr) {
         m_annoFeat->requestPaint();
     }