From: Simon Tatham <anakin@pobox.com>
Date: Tue, 9 Jun 2020 13:22:31 +0000 (+0100)
Subject: Group: fix assertion failure in Unreasonable generation.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=9aa7b7cdfb2bcd200f45941a58d6ae698882a2d4;p=sgt-puzzles.git

Group: fix assertion failure in Unreasonable generation.

Generating the game id 6dui#12345 would cause an assertion failure in
a call to latin_solver_place that should never have happened in the
first place, because the "return -1" that ought to have prevented it
was accidentally inside #ifdef STANDALONE_SOLVER.
---

diff --git a/unfinished/group.c b/unfinished/group.c
index 7acadac..006a9e0 100644
--- a/unfinished/group.c
+++ b/unfinished/group.c
@@ -404,8 +404,8 @@ static int solver_normal(struct latin_solver *solver, void *vctx)
                                    solver_recurse_depth*4, "",
                                    names[j-1], i, j);
                         }
-                        return -1;
 #endif
+                        return -1;
                     }
 #ifdef STANDALONE_SOLVER
                     if (solver_show_working) {
@@ -425,8 +425,8 @@ static int solver_normal(struct latin_solver *solver, void *vctx)
                                    solver_recurse_depth*4, "",
                                    names[j-1], j, i);
                         }
-                        return -1;
 #endif
+                        return -1;
                     }
 #ifdef STANDALONE_SOLVER
                     if (solver_show_working) {