From d207dae5b7bdf8b295e20a37da3cbc49d5606f26 Mon Sep 17 00:00:00 2001
From: Vladyslav Stelmakhovskyi <vladyslav.stelmakhovski@volvocars.com>
Date: Sun, 2 Apr 2017 20:02:40 +0200
Subject: [PATCH] Put current address to location instead of inputfield

---
 .../qml/hifi/tablet/TabletAddressDialog.qml          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
index 623054f233..0373253ff3 100644
--- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
@@ -38,7 +38,7 @@ StackView {
         root.currentItem.focus = true;
         root.currentItem.forceActiveFocus();
         fillDestinations();
-        updateLocationText();
+        updateLocationText(false);
         root.parentChanged.connect(center);
         center();
     }
@@ -62,8 +62,8 @@ StackView {
             root.push(card);
             return;
         }
-        addressLine.text = targetString;
-        toggleOrGo(true);
+        location.text = targetString;
+        toggleOrGo(true, targetString);
         clearAddressLineTimer.start();
     }
  
@@ -539,7 +539,11 @@ StackView {
         }
     }
 
-    function toggleOrGo(fromSuggestions) {
+    function toggleOrGo(fromSuggestions, address) {
+        if (address !== undefined && address !== "") {
+            addressBarDialog.loadAddress(address, fromSuggestions)
+        }
+
         if (addressLine.text !== "") {
             addressBarDialog.loadAddress(addressLine.text, fromSuggestions)
         }