fixed bug with scene resolution when one scene has no conditionals

rudism · May 10, 2020 · f7cab51 · f7cab51
1 parent 44ed5f1
commit f7cab51
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Ficdown.Parser/Ficdown.Parser.csproj b/Ficdown.Parser/Ficdown.Parser.csproj
@@ -13,6 +13,7 @@
     <PackageReference Include="Epub4Net" Version="1.2.0" />
     <PackageReference Include="Ionic.Zip" Version="1.9.1.8" />
     <PackageReference Include="Markdig" Version="0.17.1" />
+    <PackageReference Include="System.Security.Permissions" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
   </ItemGroup>
 </Project>
diff --git a/Ficdown.Parser/Player/StateManager.cs b/Ficdown.Parser/Player/StateManager.cs
@@ -182,7 +182,7 @@ private Scene GetScene(string blockName, Anchor anchor, string target, BitArray
                 {
                     if (ConditionsMatch(scene, playerState) &&
                         (newScene == null || newScene.Conditions == null ||
-                         scene.Conditions.Count > newScene.Conditions.Count))
+                         (scene.Conditions != null && scene.Conditions.Count > newScene.Conditions.Count)))
                     {
                         newScene = scene;
                     }