bugfix: fix in changeset f4c306711386 wasn't fully working

access (in case steam wasn't running) caused a crash

src/aboutdialog.ui

@@ -83,7 +83,7 @@
          <item>
           <widget class="QLabel" name="label_3">
            <property name="text">
-            <string notr="true">Copyright 2011-2014 Sebastian Herbord</string>
+            <string notr="true">Copyright 2011-2015 Sebastian Herbord</string>
            </property>
           </widget>
          </item>
@@ -180,13 +180,19 @@
               </item>
               <item>
                <property name="text">
-                <string>Ren (Korean)</string>
+                <string notr="true">Ren (Korean)</string>
+               </property>
+               <property name="toolTip">
+                <string/>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>... more (Can't track)</string>
                </property>
+               <property name="toolTip">
+                <string/>
+               </property>
               </item>
              </widget>
             </item>
@@ -226,12 +232,12 @@
               </item>
               <item>
                <property name="text">
-                <string>GamerPoet</string>
+                <string notr="true">GamerPoet</string>
                </property>
               </item>
               <item>
                <property name="text">
-                <string>Gopher</string>
+                <string notr="true">Gopher</string>
                </property>
               </item>
               <item>
@@ -256,7 +262,7 @@
               </item>
               <item>
                <property name="text">
-                <string>thosrtanner</string>
+                <string notr="true">thosrtanner</string>
                </property>
               </item>
              </widget>

src/downloadmanager.h

@@ -86,7 +86,7 @@ private:
 
     quint32 m_TaskProgressId;
 
-    MOBase::ModRepositoryFileInfo *m_FileInfo;
+    MOBase::ModRepositoryFileInfo *m_FileInfo { nullptr };
 
     bool m_Hidden;
 

src/main.cpp

@@ -369,23 +369,29 @@ int main(int argc, char *argv[])
     return 1;
   }
 
-  if (!bootstrap()) { // requires gameinfo to be initialised!
-    return -1;
-  }
-
-  LogBuffer::init(100, QtDebugMsg, qApp->property("dataPath").toString() + "/logs/mo_interface.log");
-
-#if QT_VERSION >= 0x050000
-  qDebug("ssl support: %d", QSslSocket::supportsSsl());
-#endif
-
-  qDebug("Working directory: %s", qPrintable(QDir::toNativeSeparators(QDir::currentPath())));
-  qDebug("MO at: %s", qPrintable(QDir::toNativeSeparators(application.applicationDirPath())));
   QPixmap pixmap(":/MO/gui/splash");
   QSplashScreen splash(pixmap);
-  splash.show();
 
-  cleanupDir();
+  try {
+    if (!bootstrap()) { // requires gameinfo to be initialised!
+      return -1;
+    }
+
+    LogBuffer::init(100, QtDebugMsg, qApp->property("dataPath").toString() + "/logs/mo_interface.log");
+
+#if QT_VERSION >= 0x050000
+    qDebug("ssl support: %d", QSslSocket::supportsSsl());
+#endif
+
+    qDebug("Working directory: %s", qPrintable(QDir::toNativeSeparators(QDir::currentPath())));
+    qDebug("MO at: %s", qPrintable(QDir::toNativeSeparators(application.applicationDirPath())));
+    splash.show();
+
+    cleanupDir();
+  } catch (const std::exception &e) {
+    reportError(e.what());
+    return 1;
+  }
 
   { // extend path to include dll directory so plugins don't need a manifest
     // (using AddDllDirectory would be an alternative to this but it seems fairly complicated esp.

src/mainwindow.cpp

@@ -187,8 +187,6 @@ MainWindow::MainWindow(const QString &exeName
 
   ui->actionEndorseMO->setVisible(false);
 
-  MOBase::QuestionBoxMemory::init(initSettings.fileName());
-
   updateProblemsButton();
 
   updateToolBar();

src/modinfo.cpp

@@ -431,6 +431,9 @@ void ModInfoWithConflictInfo::doConflictCheck() const
   }
 
   std::wstring name = ToWString(this->name());
+
+  m_CurrentConflictState = CONFLICT_NONE;
+
   if ((*m_DirectoryStructure)->originExists(name)) {
     FilesOrigin &origin = (*m_DirectoryStructure)->getOriginByName(name);
     std::vector<FileEntry::Ptr> files = origin.getFiles();
@@ -463,20 +466,19 @@ void ModInfoWithConflictInfo::doConflictCheck() const
         }
       }
     }
-  }
+    m_LastConflictCheck = QTime::currentTime();
 
-  m_LastConflictCheck = QTime::currentTime();
-
-  if (!providesAnything)
-    m_CurrentConflictState = CONFLICT_REDUNDANT;
-  else if (!m_OverwriteList.empty() && !m_OverwrittenList.empty())
-    m_CurrentConflictState = CONFLICT_MIXED;
-  else if (!m_OverwriteList.empty())
-    m_CurrentConflictState = CONFLICT_OVERWRITE;
-  else if (!m_OverwrittenList.empty()) {
-    m_CurrentConflictState = CONFLICT_OVERWRITTEN;
+    if (files.size() != 0) {
+      if (!providesAnything)
+        m_CurrentConflictState = CONFLICT_REDUNDANT;
+      else if (!m_OverwriteList.empty() && !m_OverwrittenList.empty())
+        m_CurrentConflictState = CONFLICT_MIXED;
+      else if (!m_OverwriteList.empty())
+        m_CurrentConflictState = CONFLICT_OVERWRITE;
+      else if (!m_OverwrittenList.empty())
+        m_CurrentConflictState = CONFLICT_OVERWRITTEN;
+    }
   }
-  else m_CurrentConflictState = CONFLICT_NONE;
 }
 
 ModInfoWithConflictInfo::EConflictType ModInfoWithConflictInfo::isConflicted() const

src/modlist.cpp

@@ -361,11 +361,9 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
     if (column == COL_FLAGS) {
       QString result;
 
-      std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
-
-      for (auto iter = flags.begin(); iter != flags.end(); ++iter) {
+      for (ModInfo::EFlag flag : modInfo->getFlags()) {
         if (result.length() != 0) result += "<br>";
-        result += getFlagText(*iter, modInfo);
+        result += getFlagText(flag, modInfo);
       }
 
       return result;
@@ -571,7 +569,8 @@ Qt::ItemFlags ModList::flags(const QModelIndex &modelIndex) const
       }
     }
     std::vector<ModInfo::EFlag> flags = modInfo->getFlags();
-    if ((m_DropOnItems) && (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) == flags.end())) {
+    if (m_DropOnItems
+        && (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) == flags.end())) {
       result |= Qt::ItemIsDropEnabled;
     }
   } else {

src/organizercore.cpp

@@ -146,6 +146,8 @@ OrganizerCore::OrganizerCore(const QSettings &initSettings)
   NexusInterface::instance()->setCacheDirectory(m_Settings.getCacheDirectory());
   NexusInterface::instance()->setNMMVersion(m_Settings.getNMMVersion());
 
+  MOBase::QuestionBoxMemory::init(initSettings.fileName());
+
   m_InstallationManager.setModsDirectory(m_Settings.getModDirectory());
   m_InstallationManager.setDownloadDirectory(m_Settings.getDownloadDirectory());
 

src/version.rc

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