Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 04:27:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

PR Changes

Browse source
This commit is contained in:
Leonardo Murillo 2014-01-17 14:39:34 -06:00
parent ff6a9b2052
commit 99275dadd4
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
interface/src/Application.cpp
View file

@ -4421,28 +4421,26 @@ void Application::parseVersionXml(QNetworkReply *reply) {
} }
} }
QFile *Application::loadSkipFile() { bool Application::shouldSkipVersion(QString latestVersion) {
QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation); QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
fileName.append(QString("/hifi.skipversion")); fileName.append(QString("/hifi.skipversion"));
QFile *file = new QFile(fileName); QFile skipFile(fileName);
file->open(QIODevice::ReadWrite); skipFile.open(QIODevice::ReadWrite);
return file; QByteArray skipFileContents = skipFile.readAll();
} QString skipVersion(skipFileContents);
skipFile.close();
bool Application::shouldSkipVersion(QString latestVersion) { if (skipVersion == latestVersion /*|| applicationVersion() == "dev"*/) {
QFile *skipFile = loadSkipFile();
QByteArray skipFileContents = skipFile->readAll();
QString *skipVersion = new QString(skipFileContents);
skipFile->close();
if (*skipVersion == latestVersion || applicationVersion() == "dev") {
return true; return true;
} }
return false; return false;
} }
void Application::skipVersion(QString latestVersion) { void Application::skipVersion(QString latestVersion) {
QFile *skipFile = loadSkipFile(); QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
skipFile->seek(0); fileName.append(QString("/hifi.skipversion"));
skipFile->write(latestVersion.toStdString().c_str()); QFile skipFile(fileName);
skipFile->close(); skipFile.open(QIODevice::WriteOnly|QIODevice::Truncate);
skipFile.seek(0);
skipFile.write(latestVersion.toStdString().c_str());
skipFile.close();
} }

1
interface/src/Application.h
View file

@ -499,7 +499,6 @@ private:
QString getLocalVoxelCacheFileName(); QString getLocalVoxelCacheFileName();
void updateLocalOctreeCache(bool firstTime = false); void updateLocalOctreeCache(bool firstTime = false);
QFile* loadSkipFile();
void checkVersion(); void checkVersion();
void displayUpdateDialog(); void displayUpdateDialog();
bool shouldSkipVersion(QString latestVersion); bool shouldSkipVersion(QString latestVersion);