From 754da1031d59f02d6a79bcbe7f2253f3b1605aa8 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 21 Jan 2019 17:44:12 +0100 Subject: [PATCH] FancyLineEdit: Do not overwrite content with non-existing history data Change-Id: Ia51417b599e0e3847a0ade54ab5633c87c2ab48c Reviewed-by: hjk --- src/libs/utils/fancylineedit.cpp | 2 +- src/libs/utils/historycompleter.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp index 55b4b12f7f1..2cebbce64ca 100644 --- a/src/libs/utils/fancylineedit.cpp +++ b/src/libs/utils/fancylineedit.cpp @@ -302,7 +302,7 @@ void FancyLineEdit::setHistoryCompleter(const QString &historyKey, bool restoreL { QTC_ASSERT(!d->m_historyCompleter, return); d->m_historyCompleter = new HistoryCompleter(historyKey, this); - if (restoreLastItemFromHistory) + if (restoreLastItemFromHistory && d->m_historyCompleter->hasHistory()) setText(d->m_historyCompleter->historyItem()); QLineEdit::setCompleter(d->m_historyCompleter); diff --git a/src/libs/utils/historycompleter.h b/src/libs/utils/historycompleter.h index 108f0d56280..07a66db145b 100644 --- a/src/libs/utils/historycompleter.h +++ b/src/libs/utils/historycompleter.h @@ -46,6 +46,7 @@ public: HistoryCompleter(const QString &historyKey, QObject *parent = nullptr); bool removeHistoryItem(int index); QString historyItem() const; + bool hasHistory() const { return historySize() > 0; } static bool historyExistsFor(const QString &historyKey); private: