Merge remote-tracking branch 'origin/starfield' into qt6-category

ModOrganizer2 · Sep 16, 2023 · fc5182b · fc5182b
2 parents a5fff7b + dff79a6
commit fc5182b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/pluginlist.cpp b/src/pluginlist.cpp
@@ -421,6 +421,8 @@ void PluginList::setEnabled(const QModelIndexList& indices, bool enabled)
 {
   QStringList dirty;
   for (auto& idx : indices) {
+    if (m_ESPs[idx.row()].forceEnabled || m_ESPs[idx.row()].forceDisabled)
+      continue;
     if (m_ESPs[idx.row()].enabled != enabled) {
       m_ESPs[idx.row()].enabled = enabled;
       dirty.append(m_ESPs[idx.row()].name);
@@ -437,6 +439,8 @@ void PluginList::setEnabledAll(bool enabled)
 {
   QStringList dirty;
   for (ESPInfo& info : m_ESPs) {
+    if (info.forceEnabled || info.forceDisabled)
+      continue;
     if (info.enabled != enabled) {
       info.enabled = enabled;
       dirty.append(info.name);

diff --git a/src/version.rc b/src/version.rc
@@ -4,7 +4,7 @@
 // Otherwise, if letters are used in VER_FILEVERSION_STR, uses the full MOBase::VersionInfo parser
 // Otherwise, uses the numbers from VER_FILEVERSION and sets the release type as pre-alpha
 #define VER_FILEVERSION     2,5,0
-#define VER_FILEVERSION_STR "2.5.0-beta2\0"
+#define VER_FILEVERSION_STR "2.5.0-beta7\0"
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION     VER_FILEVERSION