- MO now applies a minimum to the nmm-compatibility field.

- bugfix: "visit on nexus" directed the browser to the servers meant for nmm
- bugfix: url for "check all for updates" and "enorse/unendorse" were not constructed correctly

src/mainwindow.cpp

@@ -3215,7 +3215,7 @@ void MainWindow::visitOnNexus_clicked()
 {
   int modID = m_ModList.data(m_ModList.index(m_ContextRow, 0), Qt::UserRole).toInt();
   if (modID > 0)  {
-    nexusLinkActivated(QString("%1/mods/%2").arg(ToQString(GameInfo::instance().getNexusPage())).arg(modID));
+    nexusLinkActivated(QString("%1/mods/%2").arg(ToQString(GameInfo::instance().getNexusPage(false))).arg(modID));
   } else {
     MessageDialog::showMessage(tr("Nexus ID for this Mod is unknown"), this);
   }

src/nexusinterface.cpp

@@ -381,6 +381,7 @@ void NexusInterface::nextRequest()
 
   QString url;
   if (!info.m_Reroute) {
+    bool hasParams = false;
     switch (info.m_Type) {
       case NXMRequestInfo::TYPE_DESCRIPTION: {
         url = QString("%1/Mods/%2/").arg(info.m_URL).arg(info.m_ModID);
@@ -396,14 +397,16 @@ void NexusInterface::nextRequest()
       } break;
       case NXMRequestInfo::TYPE_TOGGLEENDORSEMENT: {
         url = QString("%1/Mods/toggleendorsement/%2?lvote=%3").arg(info.m_URL).arg(info.m_ModID).arg(!info.m_Endorse);
+        hasParams = true;
       } break;
       case NXMRequestInfo::TYPE_GETUPDATES: {
         QString modIDList = VectorJoin<int>(info.m_ModIDList, ",");
         modIDList = "[" + modIDList + "]";
         url = QString("%1/Mods/GetUpdates?ModList=%2").arg(info.m_URL).arg(modIDList);
+        hasParams = true;
       } break;
     }
-    url.append(QString("?game_id=%1").arg(GameInfo::instance().getNexusGameID()));
+    url.append(QString("%1game_id=%2").arg(hasParams ? '&' : '?').arg(GameInfo::instance().getNexusGameID()));
   } else {
     url = info.m_URL;
   }

src/settings.cpp

@@ -214,7 +214,12 @@ QString Settings::getModDirectory() const
 
 QString Settings::getNMMVersion() const
 {
-  return m_Settings.value("Settings/nmm_version", "0.34.0").toString();
+  static const QString MIN_NMM_VERSION = "0.46.0";
+  QString result = m_Settings.value("Settings/nmm_version", MIN_NMM_VERSION).toString();
+  if (VersionInfo(result) < VersionInfo(MIN_NMM_VERSION)) {
+    result = MIN_NMM_VERSION;
+  }
+  return result;
 }
 
 bool Settings::getNexusLogin(QString &username, QString &password) const
@@ -583,9 +588,9 @@ void Settings::query(QWidget *parent)
   downloadDirEdit->setText(getDownloadDirectory());
   modDirEdit->setText(getModDirectory());
   cacheDirEdit->setText(getCacheDirectory());
-  offlineBox->setChecked(m_Settings.value("Settings/offline_mode", false).toBool());
-  proxyBox->setChecked(m_Settings.value("Settings/use_proxy", false).toBool());
-  nmmVersionEdit->setText(m_Settings.value("Settings/nmm_version", "0.33.1").toString());
+  offlineBox->setChecked(offlineMode());
+  proxyBox->setChecked(useProxy());
+  nmmVersionEdit->setText(getNMMVersion());
   logLevelBox->setCurrentIndex(logLevel());
 
   // display plugin settings

src/shared/fallout3info.cpp

@@ -153,9 +153,13 @@ std::wstring Fallout3Info::getSEName()
 }
 
 
-std::wstring Fallout3Info::getNexusPage()
+std::wstring Fallout3Info::getNexusPage(bool nmmScheme)
 {
-  return L"http://nmm.nexusmods.com/fallout3";
+  if (nmmScheme) {
+    return L"http://nmm.nexusmods.com/fallout3";
+  } else {
+    return L"http://www.nexusmods.com/fallout3";
+  }
 }
 
 

src/shared/fallout3info.h

@@ -71,7 +71,7 @@ public:
 
   virtual std::wstring getSEName();
 
-  virtual std::wstring getNexusPage();
+  virtual std::wstring getNexusPage(bool nmmScheme = true);
   static std::wstring getNexusInfoUrlStatic();
   virtual std::wstring getNexusInfoUrl() { return Fallout3Info::getNexusInfoUrlStatic(); }
   static int getNexusModIDStatic();

src/shared/falloutnvinfo.cpp

@@ -207,9 +207,13 @@ std::wstring FalloutNVInfo::getSEName()
 }
 
 
-std::wstring FalloutNVInfo::getNexusPage()
+std::wstring FalloutNVInfo::getNexusPage(bool nmmScheme)
 {
-  return L"http://nmm.nexusmods.com/newvegas";
+  if (nmmScheme) {
+    return L"http://nmm.nexusmods.com/newvegas";
+  } else {
+    return L"http://www.nexusmods.com/newvegas";
+  }
 }
 
 

src/shared/falloutnvinfo.h

@@ -72,7 +72,7 @@ public:
 
   virtual std::wstring getSEName();
 
-  virtual std::wstring getNexusPage();
+  virtual std::wstring getNexusPage(bool nmmScheme = true);
   static std::wstring getNexusInfoUrlStatic();
   virtual std::wstring getNexusInfoUrl() { return FalloutNVInfo::getNexusInfoUrlStatic(); }
   static int getNexusModIDStatic();

src/shared/gameinfo.h

@@ -142,7 +142,7 @@ public:
 
   virtual std::wstring getSEName() = 0;
 
-  virtual std::wstring getNexusPage() = 0;
+  virtual std::wstring getNexusPage(bool nmmScheme = true) = 0;
   virtual std::wstring getNexusInfoUrl() = 0;
   virtual int getNexusModID() = 0;
   virtual int getNexusGameID() = 0;

src/shared/oblivioninfo.cpp

@@ -189,9 +189,13 @@ std::wstring OblivionInfo::getSEName()
 }
 
 
-std::wstring OblivionInfo::getNexusPage()
+std::wstring OblivionInfo::getNexusPage(bool nmmScheme)
 {
-  return L"http://nmm.nexusmods.com/oblivion";
+  if (nmmScheme) {
+    return L"http://nmm.nexusmods.com/oblivion";
+  } else {
+    return L"http://www.nexusmods.com/oblivion";
+  }
 }
 
 

src/shared/oblivioninfo.h

@@ -68,7 +68,7 @@ public:
 
   virtual std::wstring getSEName();
 
-  virtual std::wstring getNexusPage();
+  virtual std::wstring getNexusPage(bool nmmScheme = true);
   static std::wstring getNexusInfoUrlStatic();
   virtual std::wstring getNexusInfoUrl() { return OblivionInfo::getNexusInfoUrlStatic(); }
   static int getNexusModIDStatic();

src/shared/skyriminfo.cpp

@@ -181,9 +181,13 @@ std::wstring SkyrimInfo::getSEName()
 }
 
 
-std::wstring SkyrimInfo::getNexusPage()
+std::wstring SkyrimInfo::getNexusPage(bool nmmScheme)
 {
-  return L"http://nmm.nexusmods.com/skyrim";
+  if (nmmScheme) {
+    return L"http://nmm.nexusmods.com/skyrim";
+  } else {
+    return L"http://www.nexusmods.com/skyrim";
+  }
 }
 
 

src/shared/skyriminfo.h

@@ -75,7 +75,7 @@ public:
 
   virtual std::wstring getSEName();
 
-  virtual std::wstring getNexusPage();
+  virtual std::wstring getNexusPage(bool nmmScheme = true);
 
   static std::wstring getNexusInfoUrlStatic();
   virtual std::wstring getNexusInfoUrl() { return SkyrimInfo::getNexusInfoUrlStatic(); }

src/version.rc

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