Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all
Unified · Split
| @@ -4418,13 +4418,14 @@ void Application::parseVersionXml(QNetworkReply *reply) { · 4417 unmodified lines | |||
| 4418 | } | 4418 | } |
| 4419 | 4419 | ||
| 4420 | if (!shouldSkipVersion(latestVersion) && applicationVersion() != latestVersion) { | 4420 | if (!shouldSkipVersion(latestVersion) && applicationVersion() != latestVersion) { |
| 4421 | updateDialog = new UpdateDialog(_glWidget, releaseNotes); | 4421 | updateDialog = new UpdateDialog(_glWidget, releaseNotes, latestVersion, downloadURL); |
| 4422 | } | 4422 | } |
| 4423 | } | 4423 | } |
| 4424 | 4424 | ||
| 4425 | QFile *Application::loadSkipFile() { | 4425 | QFile *Application::loadSkipFile() { |
| 4426 | QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation); | 4426 | QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation); |
| 4427 | fileName.append(QString("/hifi.skipversion")); | 4427 | fileName.append(QString("/hifi.skipversion")); |
| 4428 | qDebug("###### FILENAME %s \n", fileName.toStdString().c_str()); | ||
| 4428 | QFile *file = new QFile(fileName); | 4429 | QFile *file = new QFile(fileName); |
| 4429 | file->open(QIODevice::ReadWrite); | 4430 | file->open(QIODevice::ReadWrite); |
| 4430 | return file; | 4431 | return file; |
| @@ -4435,7 +4436,7 @@ bool Application::shouldSkipVersion(QString latestVersion) { · 4 unmodified lines | |||
| 4435 | QByteArray skipFileContents = skipFile->readAll(); | 4436 | QByteArray skipFileContents = skipFile->readAll(); |
| 4436 | QString *skipVersion = new QString(skipFileContents); | 4437 | QString *skipVersion = new QString(skipFileContents); |
| 4437 | skipFile->close(); | 4438 | skipFile->close(); |
| 4438 | if (*skipVersion == latestVersion || applicationVersion() == "0.1") { | 4439 | if (*skipVersion == latestVersion /*|| applicationVersion() == "0.1"*/) { |
| 4439 | return true; | 4440 | return true; |
| 4440 | } | 4441 | } |
| 4441 | return false; | 4442 | return false; |