From 01e3ed36fbadb19e6eeca2ee25c56331bddfe32d Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@maps.me>
Date: Mon, 7 Mar 2016 13:11:46 +0200
Subject: [PATCH] =?UTF-8?q?[qt][editor]=20Correctly=20display=20valid=20fe?=
 =?UTF-8?q?ature=E2=80=99s=20street.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qt/editor_dialog.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp
index 0eaa975d63..955812c1cc 100644
--- a/qt/editor_dialog.cpp
+++ b/qt/editor_dialog.cpp
@@ -87,8 +87,12 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
       nearbyStreets.insert(nearbyStreets.begin(), "");
     grid->addWidget(new QLabel(kStreetObjectName), row, 0);
     QComboBox * cmb = new QComboBox();
-    for (auto const & street : nearbyStreets)
-      cmb->addItem(street.c_str());
+    for (int i = 0; i < nearbyStreets.size(); ++i)
+    {
+      cmb->addItem(nearbyStreets[i].c_str());
+      if (emo.GetStreet() == nearbyStreets[i])
+        cmb->setCurrentIndex(i);
+    }
     cmb->setObjectName(kStreetObjectName);
     grid->addWidget(cmb, row++, 1);