Merge branch 'hotfix/7.1.3'

powerof3 · Apr 17, 2024 · 2c80429 · 2c80429
2 parents b7f8ede + fb7935b
commit 2c80429
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/SPID/CMakeLists.txt b/SPID/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 set(NAME "po3_SpellPerkItemDistributor" CACHE STRING "")
-set(VERSION 7.1.2 CACHE STRING "")
+set(VERSION 7.1.3 CACHE STRING "")
 set(AE_VERSION 1)
 set(VR_VERSION 1)
 

diff --git a/SPID/include/FormData.h b/SPID/include/FormData.h
@@ -354,7 +354,7 @@ namespace Forms
 				}
 			}
 
-			return (options & kRequireAll) == 0 || a_formVec.size() == a_rawFormVec.size();
+			return ((options & kRequireAll) == 0 && !a_formVec.empty()) || a_formVec.size() == a_rawFormVec.size();
 		}
 	}
 

diff --git a/SPID/vcpkg.json b/SPID/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "spid",
-  "version-string": "7.1.2",
+  "version-string": "7.1.3",
   "description": "Spell Perk Item Distributor",
   "homepage": "https://github.com/powerof3/Spell-Perk-Item-Distributor",
   "license": "MIT",
-Original file line number
+Diff line change
@@ Expand Up / @@ -354,7 +354,7 @@ namespace Forms @@
     				}
     			}
-    			return (options & kRequireAll) == 0 || a_formVec.size() == a_rawFormVec.size();
+    			return ((options & kRequireAll) == 0 && !a_formVec.empty()) || a_formVec.size() == a_rawFormVec.size();
     		}
     	}
@@ Expand Down @@