updated versions

- bugfix: fomod installer didn't find fomod files in nested folder
- bugfix: python proxy will now not even try to initialize python if python_dir contains no python.
This is necessary because the python interpreter crashes the application if the path is invalid

src/ModOrganizer.pro

@@ -12,7 +12,8 @@ SUBDIRS = bsatk \
           plugins \
           proxydll \
           nxmhandler \
-    BossDummy
+    BossDummy \
+    pythonRunner
 
 hookdll.depends = shared
 organizer.depends = shared, uibase, plugins

src/downloadmanager.cpp

@@ -1150,7 +1150,9 @@ void DownloadManager::downloadFinished()
         QVariantMap serverMap = server.toMap();
         if (serverMap["URI"].toString() == url) {
           int deltaTime = info->m_StartTime.secsTo(QTime::currentTime());
-          emit downloadSpeed(serverMap["Name"].toString(), (info->m_TotalSize - info->m_PreResumeSize) / deltaTime);
+          if (deltaTime > 5) {
+            emit downloadSpeed(serverMap["Name"].toString(), (info->m_TotalSize - info->m_PreResumeSize) / deltaTime);
+          } // no division by zero please! Also, if the download is shorter than a few seconds, the result is way to inprecise
           break;
         }
       }

src/installationmanager.cpp

@@ -152,7 +152,6 @@ bool InstallationManager::unpackSingleFile(const QString &fileName)
     if (_wcsicmp(data[i]->getFileName(), ToWString(fileName).c_str()) == 0) {
       available = true;
       data[i]->setSkip(false);
-qDebug("usf %ls -> %s", data[i]->getFileName(), qPrintable(baseName));
       data[i]->setOutputFileName(ToWString(baseName).c_str());
       m_TempFilesToDelete.insert(baseName);
     } else {
@@ -727,6 +726,13 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
                 qPrintable(installer->name()), e.what());
     }
 
+    // clean up temp files
+    // TODO: this doesn't yet remove directories. Also, the files may be left there if this point isn't reached
+    foreach (const QString &tempFile, m_TempFilesToDelete) {
+      QFile::remove(QDir::tempPath() + "/" + tempFile);
+    }
+
+
     // act upon the installation result. at this point the files have already been
     // extracted to the correct location
     switch (installResult) {

src/main.cpp

@@ -182,16 +182,7 @@ void cleanupDir()
     "QtXml4.dll",
     "QtWebKit4.dll",
     "qjpeg4.dll",
-/*    "dlls/phonon4.dll",
-    "dlls/QtCore4.dll",
-    "dlls/QtGui4.dll",
-    "dlls/QtNetwork4.dll",
-    "dlls/QtXml4.dll",
-    "dlls/QtXmlPatterns4.dll",
-    "dlls/QtWebKit4.dll",
-    "dlls/QtDeclarative4.dll",
-    "dlls/QtScript4.dll",
-    "dlls/QtSql4.dll"*/
+    "NCC/GamebryoBase.dll"
   };
 
   static const int NUM_FILES = sizeof(fileNames) / sizeof(QString);

src/modinfo.h

@@ -809,7 +809,7 @@ public:
   virtual void setNeverEndorse() {}
   virtual bool remove() { return false; }
   virtual void endorse(bool) {}
-  virtual QString name() const { return tr("Overwrite"); }
+  virtual QString name() const { return "Overwrite"; }
   virtual QString notes() const { return ""; }
   virtual QDateTime creationTime() const { return QDateTime::currentDateTime(); }
   virtual QString absolutePath() const;

src/modlist.cpp

@@ -91,7 +91,7 @@ QVariant ModList::getOverwriteData(int column, int role) const
   switch (role) {
     case Qt::DisplayRole: {
       if (column == 0) {
-        return tr("Overwrite");
+        return "Overwrite";
       } else {
         return QVariant();
       }

src/nxmaccessmanager.cpp

@@ -40,7 +40,7 @@ using namespace MOShared;
 
 
 NXMAccessManager::NXMAccessManager(QObject *parent)
-  : QNetworkAccessManager(parent), m_LoginReply(NULL)
+  : QNetworkAccessManager(parent), m_LoginReply(NULL), m_ProgressDialog()
 {
 }
 

src/version.rc

@@ -1,7 +1,7 @@
 #include "Winver.h"
 
-#define VER_FILEVERSION     0,99,4,0
-#define VER_FILEVERSION_STR "0,99,4,0\0"
+#define VER_FILEVERSION     0,99,6,0
+#define VER_FILEVERSION_STR "0,99,6,0\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION