From 6742f59cb3668b7c7eaa4b1c305bc56359686121 Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Tue, 3 Sep 2019 14:35:25 +0200
Subject: [PATCH] #4662 Fix erratic behaviour in Tree Selection Editor

---
 .../cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h   | 6 ++++--
 .../cafPdmUiCore/cafInternalPdmUiFieldCapability.inl        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h
index ff362b7f6a..a6d192adce 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h
@@ -84,9 +84,10 @@ public:
         }
     }
 
+    /// Operates on scalar content T value of the std::list<T>
     static bool isDataElementEqual(const QVariant& variantValue, const QVariant& variantValue2)
     {
-        return PdmValueFieldSpecialization<std::list<T>>::isEqual(variantValue, variantValue2);
+        return PdmValueFieldSpecialization<T>::isEqual(variantValue, variantValue2);
     }
 
     /// Methods to get a list of options for a field, specialized for AppEnum
@@ -121,9 +122,10 @@ public:
         return PdmValueFieldSpecialization< std::vector<T> >::setFromVariant(variantValue, value);
     }
 
+    /// Operates on scalar content T value of the std::vector<T>
     static bool isDataElementEqual(const QVariant& variantValue, const QVariant& variantValue2)
     {
-        return PdmValueFieldSpecialization<std::vector<T>>::isEqual(variantValue, variantValue2);
+         return PdmValueFieldSpecialization<T>::isEqual(variantValue, variantValue2);
     }
 
     /// Methods to get a list of options for a field, specialized for AppEnum
diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.inl b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.inl
index 4305d2e547..9b3cafe575 100644
--- a/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.inl
+++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.inl
@@ -253,7 +253,7 @@ QVariant caf::PdmFieldUiCap<FieldType>::toUiBasedQVariant() const
 template < typename FieldType>
 bool caf::PdmFieldUiCap<FieldType>::isQVariantDataEqual(const QVariant& oldUiBasedQVariant, const QVariant& newUiBasedQVariant) const
 {
-    return PdmUiFieldSpecialization<typename FieldType::FieldDataType>::isDataElementEqual(oldUiBasedQVariant, newUiBasedQVariant);
+    return PdmValueFieldSpecialization<typename FieldType::FieldDataType>::isEqual(oldUiBasedQVariant, newUiBasedQVariant);
 }