From dc02e3478298e9b92b55a4915881fd512f0daeef Mon Sep 17 00:00:00 2001
From: seefo <robbie.uvanni@gmail.com>
Date: Thu, 8 Jun 2017 16:22:52 -0700
Subject: [PATCH] Resolved FB#5009

---
 interface/src/AvatarBookmarks.cpp | 24 ++++++++++++++++++++++--
 interface/src/AvatarBookmarks.h   |  1 +
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp
index 5cdfc8213f..db2a240b92 100644
--- a/interface/src/AvatarBookmarks.cpp
+++ b/interface/src/AvatarBookmarks.cpp
@@ -21,15 +21,35 @@
 
 #include "MainWindow.h"
 #include "Menu.h"
-
 #include "AvatarBookmarks.h"
+#include "InterfaceLogging.h"
+
 #include <QtQuick/QQuickWindow>
 
 AvatarBookmarks::AvatarBookmarks() {
-    _bookmarksFilename = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + AVATARBOOKMARKS_FILENAME;
+    _bookmarksFilename = PathUtils::getAppDataPath() + "/" + AVATARBOOKMARKS_FILENAME;
     readFromFile();
 }
 
+void AvatarBookmarks::readFromFile() {
+    // migrate old avatarbookmarks.json, used to be in 'local' folder on windows
+    QString oldConfigPath = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + AVATARBOOKMARKS_FILENAME;
+    QFile oldConfig(oldConfigPath);
+    
+    // I imagine that in a year from now, this code for migrating (as well as the two lines above)
+    // may be removed since all bookmarks should have been migrated by then
+    // - Robbie Uvanni (6.8.2017)
+    if (oldConfig.exists()) {
+        if (QDir().rename(oldConfigPath, _bookmarksFilename)) {
+            qCDebug(interfaceapp) << "Successfully migrated" << AVATARBOOKMARKS_FILENAME;
+        } else {
+            qCDebug(interfaceapp) << "Failed to migrate" << AVATARBOOKMARKS_FILENAME;
+        }
+    } 
+    
+    Bookmarks::readFromFile();     
+}
+
 void AvatarBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
     // Add menus/actions
     auto bookmarkAction = menubar->addActionToQMenuAndActionHash(menu, MenuOption::BookmarkAvatar);
diff --git a/interface/src/AvatarBookmarks.h b/interface/src/AvatarBookmarks.h
index 725af88b0d..dc5a0aee6e 100644
--- a/interface/src/AvatarBookmarks.h
+++ b/interface/src/AvatarBookmarks.h
@@ -29,6 +29,7 @@ public slots:
 
 protected:
     void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) override;
+    void readFromFile();
 
 private:
     const QString AVATARBOOKMARKS_FILENAME = "avatarbookmarks.json";