From 23a03ebcd17be328508e749afeb2cd962296be3b Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 19 Sep 2014 17:38:48 +0200 Subject: [PATCH] Fix crash in QCombobox when resetting model during currentIndexChanged() Task-number: QTBUG-20415 Change-Id: Idffc0f29cc55d834c2736ce7562dd7cfe912d327 Reviewed-by: Gabriel de Dietrich --- src/widgets/widgets/qcombobox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index b4f9d25331..2b064c3184 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -1280,8 +1280,8 @@ void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index) void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index) { Q_Q(QComboBox); - emit q->currentIndexChanged(index.row()); const QString text = itemText(index); + emit q->currentIndexChanged(index.row()); emit q->currentIndexChanged(text); // signal lineEdit.textChanged already connected to signal currentTextChanged, so don't emit double here if (!lineEdit)