From 1050141b11058ef6205724b0847acb66f63de3d4 Mon Sep 17 00:00:00 2001
From: Liv <liv@highfidelity.io>
Date: Wed, 23 Aug 2017 17:38:24 -0700
Subject: [PATCH] Create home path for new content sets loaded in

---
 interface/src/Application.cpp       | 6 +++++-
 interface/src/LocationBookmarks.cpp | 4 ++++
 interface/src/LocationBookmarks.h   | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 398b2dbdb4..efa601d61e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6263,7 +6263,11 @@ bool Application::askToReplaceDomainContent(const QString& url) {
                     octreeFilePacket->write(urlData);
                     limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode);
                 });
-                DependencyManager::get<AddressManager>()->handleLookupString(DOMAIN_SPAWNING_POINT);
+                auto addressManager = DependencyManager::get<AddressManager>();
+                addressManager->handleLookupString(DOMAIN_SPAWNING_POINT);
+                QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT;
+                qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress;
+                DependencyManager::get<LocationBookmarks>()->setHomeLocationToAddress(newHomeAddress);
                 methodDetails = "SuccessfulRequestToReplaceContent";
             } else {
                 methodDetails = "UserDeclinedToReplaceContent";
diff --git a/interface/src/LocationBookmarks.cpp b/interface/src/LocationBookmarks.cpp
index eee6cdf3c8..b234f8c07b 100644
--- a/interface/src/LocationBookmarks.cpp
+++ b/interface/src/LocationBookmarks.cpp
@@ -63,6 +63,10 @@ void LocationBookmarks::setHomeLocation() {
     Bookmarks::addBookmarkToFile(HOME_BOOKMARK, bookmarkAddress);
 }
 
+void LocationBookmarks::setHomeLocationToAddress(const QVariant& address) {
+    Bookmarks::insert("Home", address);
+}
+
 void LocationBookmarks::teleportToBookmark() {
     QAction* action = qobject_cast<QAction*>(sender());
     QString address = action->data().toString();
diff --git a/interface/src/LocationBookmarks.h b/interface/src/LocationBookmarks.h
index 6cac56ae04..9a800ba35e 100644
--- a/interface/src/LocationBookmarks.h
+++ b/interface/src/LocationBookmarks.h
@@ -27,6 +27,7 @@ public:
 
 public slots:
     void addBookmark();
+    void setHomeLocationToAddress(const QVariant& address);
 
 protected:
     void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& address) override;