Merge branch 'master' of github.com:highfidelity/hifi into update-collision-hulls-of-avatar-children

This commit is contained in:
Seth Alves 2016-04-06 16:42:27 -07:00
commit 30d6734253

View file

@ -63,6 +63,11 @@ bool Bookmarks::contains(const QString& name) const {
void Bookmarks::readFromFile() {
QFile loadFile(_bookmarksFilename);
if (!loadFile.exists()) {
// User has not yet saved bookmarks
return;
}
if (!loadFile.open(QIODevice::ReadOnly)) {
qWarning("Couldn't open bookmarks file for reading");
return;