From a6a227d14e274be50b7f1bed395be01103a914bc Mon Sep 17 00:00:00 2001
From: Mikko <mikko.teuho@tut.fi>
Date: Thu, 28 Mar 2019 14:56:43 +0200
Subject: [PATCH] [CORRECTIVE] Updated vendor extension editor child extension
 addition.

---
 common/views/EditableTreeView/EditableTreeView.cpp |  9 +++++----
 .../VendorExtensionsModel.cpp                      | 13 ++++++++-----
 version.h                                          | 14 +++++++-------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/common/views/EditableTreeView/EditableTreeView.cpp b/common/views/EditableTreeView/EditableTreeView.cpp
index dcea78943..4b458f01a 100644
--- a/common/views/EditableTreeView/EditableTreeView.cpp
+++ b/common/views/EditableTreeView/EditableTreeView.cpp
@@ -168,13 +168,14 @@ void EditableTreeView::onAddSubItem()
 {
     QApplication::setOverrideCursor(Qt::WaitCursor);
 
-    QModelIndexList currentIndexes = selectedIndexes();
+    QModelIndexList currentIndexes;
+    for (auto index : selectedIndexes())
+    {
+        currentIndexes.append(index.sibling(index.row(), 0));
+    }
 
     emit addSubItem(currentIndexes);
 
-    clearSelection();
-    setCurrentIndex(QModelIndex());
-
     foreach (QModelIndex index, currentIndexes)
     {
         expand(index);
diff --git a/editors/common/VendorExtensionEditor/VendorExtensionsModel.cpp b/editors/common/VendorExtensionEditor/VendorExtensionsModel.cpp
index 15dd97e89..7ee293762 100644
--- a/editors/common/VendorExtensionEditor/VendorExtensionsModel.cpp
+++ b/editors/common/VendorExtensionEditor/VendorExtensionsModel.cpp
@@ -161,13 +161,16 @@ QVariant VendorExtensionsModel::valueForIndex(QModelIndex const& index) const
     }
     else if (index.column() == VendorExtensionColumns::ATTRIBUTES)
     {
-        QStringList typeList;
-        for (auto attribute : genericExtension->getAttributes())
+        if (genericExtension)
         {
-            typeList.append(attribute.first);
-        }
+            QStringList typeList;
+            for (auto attribute : genericExtension->getAttributes())
+            {
+                typeList.append(attribute.first);
+            }
 
-        return typeList.join(",");
+            return typeList.join(",");
+        }
     }
     else if (index.column() == VendorExtensionColumns::VALUE)
     {
diff --git a/version.h b/version.h
index 5764a198c..c4fd4c745 100644
--- a/version.h
+++ b/version.h
@@ -10,20 +10,20 @@
 #ifndef VERSIONNO__H
 #define VERSIONNO__H
 
-#define VERSION_FULL           3.6.809.0
+#define VERSION_FULL           3.6.833.0
 
 #define VERSION_BASEYEAR       0
 #define VERSION_DATE           "2019-03-28"
-#define VERSION_TIME           "12:46:13"
+#define VERSION_TIME           "14:53:53"
 
 #define VERSION_MAJOR          3
 #define VERSION_MINOR          6
-#define VERSION_BUILDNO        809
+#define VERSION_BUILDNO        833
 #define VERSION_EXTEND         0
 
-#define VERSION_FILE           3,6,809,0
-#define VERSION_PRODUCT        3,6,809,0
-#define VERSION_FILESTR        "3,6,809,0"
-#define VERSION_PRODUCTSTR     "3,6,809,0"
+#define VERSION_FILE           3,6,833,0
+#define VERSION_PRODUCT        3,6,833,0
+#define VERSION_FILESTR        "3,6,833,0"
+#define VERSION_PRODUCTSTR     "3,6,833,0"
 
 #endif