From fd7776fc3a482d1dbdc4ee4b1f1f3a7a09595bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Neven=20Pra=C5=A1nikar?= <DaloLorn@users.noreply.github.com>
Date: Sun, 20 Mar 2022 19:28:10 +0100
Subject: [PATCH 1/2] Added short-circuit evaluation to subsystem template
 conditions.

---
 source/game/design/subsystem.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/game/design/subsystem.cpp b/source/game/design/subsystem.cpp
index fa03a91..6698503 100644
--- a/source/game/design/subsystem.cpp
+++ b/source/game/design/subsystem.cpp
@@ -390,7 +390,6 @@ struct TemplateBlock {
 };
 
 bool conditionMatches(const SubsystemDef* cur, std::vector<std::pair<int,std::string>>& conditions) {
-	bool passesAll = true;
 	foreach(c, conditions) {
 		int type = c->first;
 		bool negation = false;
@@ -458,14 +457,14 @@ bool conditionMatches(const SubsystemDef* cur, std::vector<std::pair<int,std::st
 
 		if(!negation) {
 			if(!pass)
-				passesAll = false;
+				return false;
 		}
 		else {
 			if(pass)
-				passesAll = false;
+				return false;
 		}
 	}
-	return passesAll;
+	return true;
 }
 
 void parseConditions(const std::string& value, std::vector<std::pair<int,std::string>>& conditions) {

From 70a103484ae1106c12a6d892aca47ce2186e2dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Neven=20Pra=C5=A1nikar?= <DaloLorn@users.noreply.github.com>
Date: Sun, 20 Mar 2022 19:34:26 +0100
Subject: [PATCH 2/2] Updated Windows build runner. See
 https://github.com/actions/virtual-environments/issues/5238 for explanation.

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 62e88c1..d9e3c8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
       BUILD_CONFIGURATION: Non-Steam Release
 
     name: Windows build
-    runs-on: windows-2016
+    runs-on: windows-2019
 
     steps:
     - uses: actions/checkout@v2