Commit 0840b93f authored by Tobias Hunger's avatar Tobias Hunger Committed by Eike Ziller
Browse files

Fix possible crash in environmentsmodel



Change-Id: Ib6a3450a7974dc568ba07633a38a29d598a9099f
Reviewed-by: default avatarEike Ziller <eike.ziller@nokia.com>
parent a1b2fc95
......@@ -211,7 +211,7 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
const QString &newName = value.toString();
#endif
// Does the new name exist already?
if (d->m_resultEnvironment.hasKey(newName))
if (d->m_resultEnvironment.hasKey(newName) || newName.isEmpty())
return false;
Utils::EnvironmentItem newVariable(newName, oldValue);
......@@ -227,7 +227,7 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
const QString stringValue = value.toString();
if (changesPos != -1) {
// We have already changed this value
if (stringValue == d->m_baseEnvironment.value(oldName)) {
if (d->m_baseEnvironment.hasKey(oldName) && stringValue == d->m_baseEnvironment.value(oldName)) {
// ... and now went back to the base value
d->m_items.removeAt(changesPos);
} else {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment