Merge

1 files changed, 6 insertions, 12 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 295fb75a..ae3bbb4c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -170,13 +170,14 @@ void cleanupDir()
     "proxy.dll"

   };

 

-  qDebug("removing obsolete files");

-

   for (const QString &fileName : fileNames) {

     QString fullPath = qApp->applicationDirPath() + "/" + fileName;

-    if (QFile::exists(fullPath)

-        && !shellDelete(QStringList(fullPath), true)) {

-      qDebug("failed to remove obsolete %s", qPrintable(fullPath));

+    if (QFile::exists(fullPath)) {

+      if (shellDelete(QStringList(fullPath), true)) {

+        qDebug("removed obsolete file %s", qPrintable(fullPath));

+      } else {

+        qDebug("failed to remove obsolete %s", qPrintable(fullPath));

+      }

     }

   }

 }

@@ -248,11 +249,6 @@ static LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *except
   return result;

 }

 

-static void registerMetaTypes()

-{

-  registerExecutable();

-}

-

 static bool HaveWriteAccess(const std::wstring &path)

 {

   bool writable = false;

@@ -414,8 +410,6 @@ int main(int argc, char *argv[])
     ::SetEnvironmentVariableW(L"PATH", newPath.c_str());

   }

 

-  registerMetaTypes();

-

   QStringList arguments = application.arguments();

 

   bool forcePrimary = false;