Fix crash when changing datainput for text element

Data input connection always used the handle and instance values that
were used when the connection was established. Also changed it so that
callback from selection dialog only comes when user changes the
selection instead of getting one during dialog setup.

Task-number: QT3DS-1056
Change-Id: Ic4d6bf78ebba5859f55c69f946bc10d7b8154a06
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

2 files changed, 5 insertions, 2 deletions

diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
index c53b120c..e21cb5cd 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.cpp
@@ -243,8 +243,11 @@ void SlideView::OnSlideRearranged(const qt3dsdm::Qt3DSDMSlideHandle &inMaster, i
     m_SlidesModel->onSlideRearranged(inMaster, inOldIndex, inNewIndex);
 }
 
-void SlideView::onDataInputChange(const QString &dataInputName)
+void SlideView::onDataInputChange(int handle, int instance, const QString &dataInputName)
 {
+    Q_UNUSED(handle)
+    Q_UNUSED(instance)
+
     if (dataInputName == m_currentController ||
         (dataInputName == tr("[No Control]") && !m_currentController.size())) {
         return;
diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.h b/src/Authoring/Studio/Palettes/Slide/SlideView.h
index 12594637..fcfbcff0 100644
--- a/src/Authoring/Studio/Palettes/Slide/SlideView.h
+++ b/src/Authoring/Studio/Palettes/Slide/SlideView.h
@@ -64,7 +64,7 @@ public:
     void setShowMasterSlide(bool show);
     QAbstractItemModel *currentModel() { return m_CurrentModel; }
     QSize sizeHint() const override;
-    void onDataInputChange(const QString &dataInputName);
+    void onDataInputChange(int handle, int instance, const QString &dataInputName);
 
     Q_INVOKABLE void deselectAll();
     Q_INVOKABLE void addNewSlide(int row);