From 4db346167d0bbf299b958bbb5a9951bede212618 Mon Sep 17 00:00:00 2001 From: Alexander Ivash Date: Wed, 30 May 2018 23:49:02 +0300 Subject: [PATCH] fix extracting default avatar bookmarks from resources --- interface/src/AvatarBookmarks.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp index da8fb010bb..4ffc928ab1 100644 --- a/interface/src/AvatarBookmarks.cpp +++ b/interface/src/AvatarBookmarks.cpp @@ -95,8 +95,14 @@ void addAvatarEntities(const QVariantList& avatarEntities) { AvatarBookmarks::AvatarBookmarks() { _bookmarksFilename = PathUtils::getAppDataPath() + "/" + AVATARBOOKMARKS_FILENAME; if(!QFile::exists(_bookmarksFilename)) { - auto defaultBookmarksFilename = PathUtils::resourcesUrl(QString("avatar/bookmarks") + "/" + AVATARBOOKMARKS_FILENAME).toLocalFile(); - QFile::copy(defaultBookmarksFilename, _bookmarksFilename); + auto defaultBookmarksFilename = PathUtils::resourcesPath() + QString("avatar/bookmarks") + "/" + AVATARBOOKMARKS_FILENAME; + if (!QFile::exists(defaultBookmarksFilename)) { + qDebug() << defaultBookmarksFilename << "doesn't exist!"; + } + + if (!QFile::copy(defaultBookmarksFilename, _bookmarksFilename)) { + qDebug() << "failed to copy" << defaultBookmarksFilename << "to" << _bookmarksFilename; + } } readFromFile(); }