diff options
| author | Gonzalo Odiard <godiard@gmail.com> | 2011-09-29 14:52:41 (GMT) |
|---|---|---|
| committer | Gonzalo Odiard <godiard@gmail.com> | 2011-09-29 14:52:41 (GMT) |
| commit | bec5befe53747d1ddabcfe5742380b04ed81062e (patch) | |
| tree | 95343c7eac5d5705d8f5e014a8c9206d1463d2c4 /activity.py | |
| parent | d4a55ac6afd79769ef0f659e0c9098a4be3f55eb (diff) | |
Reload the cardlist when the game is changed - SL #3137
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
Diffstat (limited to 'activity.py')
| -rw-r--r-- | activity.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/activity.py b/activity.py index 2524023..90bc175 100644 --- a/activity.py +++ b/activity.py @@ -208,7 +208,6 @@ class MemorizeActivity(Activity): game_file = os.path.join(os.path.dirname(__file__), 'demos', 'addition.zip') self.game.load_game(game_file, 4, 'demo') - self.cardlist.load_game(self.game) _logger.debug('loading conventional') self.game.add_buddy(self.owner) else: @@ -302,6 +301,7 @@ class MemorizeActivity(Activity): self.hbox.remove(self.table) self.hbox.pack_start(self.createcardpanel, False) self.hbox.pack_start(self.cardlist) + self.cardlist.load_game(self.game) self.game.model.create_temp_directories() self.createcardpanel.set_temp_folder( self.game.model.temp_folder) @@ -329,8 +329,7 @@ class MemorizeActivity(Activity): title=None, color=None): _logger.debug('Change game %s', game_name) self.game.change_game(widget, game_name, size, mode, title, color) - if game_name is not None: - self.cardlist.load_game(self.game) + self.cardlist.game_loaded = False def change_equal_pairs(self, widget, state): self.cardlist.update_model(self.game.model) |