fix blackjack when hitting blackjack

files/helpers/blackjack.py

@@ -51,7 +51,7 @@ def get_active_game(gambler):
 	game = g.db.query(Casino_Game) \
 		.filter(Casino_Game.active == True,
 				Casino_Game.kind == 'blackjack',
-				Casino_Game.user_id == gambler.id).first()
+				Casino_Game.user_id == gambler.id).one_or_none()
 
 	if game:
 		return game, json.loads(game.game_state)
@@ -95,6 +95,7 @@ def apply_blackjack_result(gambler):
 			gambler.winnings += reward
 			game.winnings += reward
 
+		if result not in ('push','blackjack'):
 			game.active = False
 		g.db.add(game)
 

files/routes/casino.py

@@ -79,6 +79,8 @@ def deal_blackjack(v):
 
 		if game and game.active:
 			safe_state = get_safe_game_state(v)
+			if safe_state['status'] in ('push','blackjack'):
+				game.active = False
 			return {"game_state": safe_state, "gambler": { "coins": v.coins, "procoins": v.procoins }}
 		else:
 			return {"game_state": game_state, "gambler": { "coins": v.coins, "procoins": v.procoins }}