History

PR Changes

Leonardo Murillo committed 12 years ago

Commit 93e4dc71 parent e0761db4 files · +14 −13Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+3−2
@@ -4418,13 +4418,14 @@ void Application::parseVersionXml(QNetworkReply *reply) { · 4417 unmodified lines
44184418 }
44194419
44204420 if (!shouldSkipVersion(latestVersion) && applicationVersion() != latestVersion) {
4421− updateDialog = new UpdateDialog(_glWidget, releaseNotes);
4421+ updateDialog = new UpdateDialog(_glWidget, releaseNotes, latestVersion, downloadURL);
44224422 }
44234423 }
44244424
44254425 QFile *Application::loadSkipFile() {
44264426 QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
44274427 fileName.append(QString("/hifi.skipversion"));
4428+ qDebug("###### FILENAME %s \n", fileName.toStdString().c_str());
44284429 QFile *file = new QFile(fileName);
44294430 file->open(QIODevice::ReadWrite);
44304431 return file;
@@ -4435,7 +4436,7 @@ bool Application::shouldSkipVersion(QString latestVersion) { · 4 unmodified lines
44354436 QByteArray skipFileContents = skipFile->readAll();
44364437 QString *skipVersion = new QString(skipFileContents);
44374438 skipFile->close();
4438− if (*skipVersion == latestVersion || applicationVersion() == "0.1") {
4439+ if (*skipVersion == latestVersion /*|| applicationVersion() == "0.1"*/) {
44394440 return true;
44404441 }
44414442 return false;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t