From 99275dadd4e99bfc1ab3506b520137ed033b74b2 Mon Sep 17 00:00:00 2001
From: Leonardo Murillo <leo@highfidelity.io>
Date: Fri, 17 Jan 2014 14:39:34 -0600
Subject: [PATCH] PR Changes

---
 interface/src/Application.cpp | 30 ++++++++++++++----------------
 interface/src/Application.h   |  1 -
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 4bb40af623..ae82d44e90 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4421,28 +4421,26 @@ void Application::parseVersionXml(QNetworkReply *reply) {
     }
 }
 
-QFile *Application::loadSkipFile() {
+bool Application::shouldSkipVersion(QString latestVersion) {
     QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
     fileName.append(QString("/hifi.skipversion"));
-    QFile *file = new QFile(fileName);
-    file->open(QIODevice::ReadWrite);
-    return file;
-}
-
-bool Application::shouldSkipVersion(QString latestVersion) {
-    QFile *skipFile = loadSkipFile();
-    QByteArray skipFileContents = skipFile->readAll();
-    QString *skipVersion = new QString(skipFileContents);
-    skipFile->close();
-    if (*skipVersion == latestVersion || applicationVersion() == "dev") {
+    QFile skipFile(fileName);
+    skipFile.open(QIODevice::ReadWrite);
+    QByteArray skipFileContents = skipFile.readAll();
+    QString skipVersion(skipFileContents);
+    skipFile.close();
+    if (skipVersion == latestVersion /*|| applicationVersion() == "dev"*/) {
         return true;
     }
     return false;
 }
 
 void Application::skipVersion(QString latestVersion) {
-    QFile *skipFile = loadSkipFile();
-    skipFile->seek(0);
-    skipFile->write(latestVersion.toStdString().c_str());
-    skipFile->close();
+    QString fileName = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+    fileName.append(QString("/hifi.skipversion"));
+    QFile skipFile(fileName);
+    skipFile.open(QIODevice::WriteOnly|QIODevice::Truncate);
+    skipFile.seek(0);
+    skipFile.write(latestVersion.toStdString().c_str());
+    skipFile.close();
 }
diff --git a/interface/src/Application.h b/interface/src/Application.h
index ce9f2bbaae..acb2901452 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -499,7 +499,6 @@ private:
     QString getLocalVoxelCacheFileName();
     void updateLocalOctreeCache(bool firstTime = false);
     
-    QFile* loadSkipFile();
     void checkVersion();
     void displayUpdateDialog();
     bool shouldSkipVersion(QString latestVersion);