diff --git a/Code/Visualization/otbVectorDataModel.cxx b/Code/Visualization/otbVectorDataModel.cxx
index 07a2472ef0402a45035804e1ead1cd84e06388a4..1dc96e03ed385c42ba1ef30dc654a9258a5b5f3b 100644
--- a/Code/Visualization/otbVectorDataModel.cxx
+++ b/Code/Visualization/otbVectorDataModel.cxx
@@ -166,7 +166,8 @@ void VectorDataModel::DeleteGeometry(void)
     VectorDataType::DataTreeType::PreOrderIteratorType it(m_VectorData->GetDataTree(),
                                                           m_VectorData->GetDataTree()->GetRoot());
     it.GoToBegin();
-    while (!it.IsAtEnd() || ((it.GetNode())->Get() != m_SelectedGeometry))
+    while ( !it.IsAtEnd()
+            && it.GetNode()->Get() != m_SelectedGeometry )
       {
       ++it;
       }