Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-13 05:35:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Seth Alves 2016-04-06 16:42:27 -07:00
commit 30d6734253
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Bookmarks.cpp
View file

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