Fix rematch button.

2 files changed, 9 insertions, 4 deletions

diff --git a/server.js b/server.js
index 3fc6274..38093c0 100644
--- a/server.js
+++ b/server.js
@@ -1121,7 +1121,7 @@ const SQL_DELETE_PLAYER_ROLE = SQL("DELETE FROM players WHERE game_id=? AND role
 const SQL_SELECT_OPEN_GAMES = SQL(`SELECT * FROM games WHERE status=${STATUS_OPEN}`)
 const SQL_COUNT_OPEN_GAMES = SQL(`SELECT COUNT(*) FROM games WHERE owner_id=? AND status=${STATUS_OPEN}`).pluck()
 
-const SQL_SELECT_REMATCH = SQL(`SELECT game_id FROM games WHERE status = ${STATUS_FINISHED} AND notice=?`).pluck()
+const SQL_SELECT_REMATCH = SQL(`SELECT game_id FROM games WHERE status < ${STATUS_FINISHED} AND notice=?`).pluck()
 const SQL_INSERT_REMATCH = SQL(`
 	INSERT INTO games
 		(owner_id, title_id, scenario, options, is_private, is_random, notice)
diff --git a/tools/undo.sh b/tools/undo.sh
index 889d6b8..b75182f 100644
--- a/tools/undo.sh
+++ b/tools/undo.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 if [ -n "$1" ]
 then
-	COUNT=$(sqlite3 db "select coalesce(max(replay_id),0) from game_replay where game_id=$1")
-	echo Game has $COUNT actions.
-	sqlite3 db "delete from game_replay where game_id=$1 and replay_id=$COUNT"
+	if [ -n "$2" ]
+	then
+		COUNT=$2
+	else
+		COUNT=$(sqlite3 db "select coalesce(max(replay_id),0) from game_replay where game_id=$1")
+		echo Game has $COUNT actions.
+	fi
+	sqlite3 db "delete from game_replay where game_id=$1 and replay_id>=$COUNT"
 	node tools/patchgame.js $1 '{"validate_actions":false}'
 else
 	echo "usage: bash tools/undo.sh GAME"