Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -4421,28 +4421,26 @@ void Application::parseVersionXml(QNetworkReply *reply) { · 4420 unmodified lines | ||
| 4421 | 4421 | } |
| 4422 | 4422 | } |
| 4423 | 4423 | |
| 4424 | −QFile *Application::loadSkipFile() { | |
| 4424 | +bool Application::shouldSkipVersion(QString latestVersion) { | |
| 4425 | 4425 | QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation); |
| 4426 | 4426 | fileName.append(QString("/hifi.skipversion")); |
| 4427 | − QFile *file = new QFile(fileName); | |
| 4428 | − file->open(QIODevice::ReadWrite); | |
| 4429 | − return file; | |
| 4430 | −} | |
| 4431 | − | |
| 4432 | −bool Application::shouldSkipVersion(QString latestVersion) { | |
| 4433 | − QFile *skipFile = loadSkipFile(); | |
| 4434 | − QByteArray skipFileContents = skipFile->readAll(); | |
| 4435 | − QString *skipVersion = new QString(skipFileContents); | |
| 4436 | − skipFile->close(); | |
| 4437 | − if (*skipVersion == latestVersion || applicationVersion() == "dev") { | |
| 4427 | + QFile skipFile(fileName); | |
| 4428 | + skipFile.open(QIODevice::ReadWrite); | |
| 4429 | + QByteArray skipFileContents = skipFile.readAll(); | |
| 4430 | + QString skipVersion(skipFileContents); | |
| 4431 | + skipFile.close(); | |
| 4432 | + if (skipVersion == latestVersion /*|| applicationVersion() == "dev"*/) { | |
| 4438 | 4433 | return true; |
| 4439 | 4434 | } |
| 4440 | 4435 | return false; |
| 4441 | 4436 | } |
| 4442 | 4437 | |
| 4443 | 4438 | void Application::skipVersion(QString latestVersion) { |
| 4444 | − QFile *skipFile = loadSkipFile(); | |
| 4445 | − skipFile->seek(0); | |
| 4446 | − skipFile->write(latestVersion.toStdString().c_str()); | |
| 4447 | − skipFile->close(); | |
| 4439 | + QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation); | |
| 4440 | + fileName.append(QString("/hifi.skipversion")); | |
| 4441 | + QFile skipFile(fileName); | |
| 4442 | + skipFile.open(QIODevice::WriteOnly|QIODevice::Truncate); | |
| 4443 | + skipFile.seek(0); | |
| 4444 | + skipFile.write(latestVersion.toStdString().c_str()); | |
| 4445 | + skipFile.close(); | |
| 4448 | 4446 | } |