From 2c16d5773dc5ee6ffb3c59bd175bc5da6b6f5dc0 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Sun, 9 Feb 2020 10:47:53 +0200 Subject: [PATCH] fix a crash on "open game" --- pysollib/game/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pysollib/game/__init__.py b/pysollib/game/__init__.py index db624bbb..340ae1e7 100644 --- a/pysollib/game/__init__.py +++ b/pysollib/game/__init__.py @@ -67,6 +67,8 @@ from pysollib.settings import PACKAGE, TITLE, TOOLKIT, TOP_SIZE from pysollib.settings import VERSION, VERSION_TUPLE from pysollib.struct_new import NewStruct +import random2 + import six from six import BytesIO from six.moves import range @@ -3196,7 +3198,9 @@ class Game(object): initial_seed = random__long2str(pload(int)) game.random = constructRandom(initial_seed) state = pload() - game.random.setstate(state) + if not (isinstance(game.random, random2.Random) and + isinstance(state, int)): + game.random.setstate(state) # if not hasattr(game.random, "origin"): # game.random.origin = game.random.ORIGIN_UNKNOWN game.loadinfo.stacks = []