diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py index c2778789..b0da336b 100644 --- a/pyfpdb/Filters.py +++ b/pyfpdb/Filters.py @@ -290,6 +290,7 @@ class Filters(threading.Thread): cb = gtk.CheckButton(game) cb.connect('clicked', self.__set_game_select, game) hbox.pack_start(cb, False, False, 0) + cb.set_active(True) def createLimitLine(self, hbox, limit, ltext): cb = gtk.CheckButton(str(ltext)) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 4bf3da8b..d2b795e6 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -617,6 +617,8 @@ class HoldemOmahaHand(Hand): # which then invokes a 'addXXX' callback if builtFrom == "HHC": hhc.readHandInfo(self) + if self.gametype['type'] == 'tour': + self.tablename = "%s %s" % (self.tourNo, self.tablename) hhc.readPlayerStacks(self) hhc.compilePlayerRegexs(self) hhc.markStreets(self) @@ -911,6 +913,8 @@ class DrawHand(Hand): # Populate the draw hand. if builtFrom == "HHC": hhc.readHandInfo(self) + if self.gametype['type'] == 'tour': + self.tablename = "%s %s" % (self.tourNo, self.tablename) hhc.readPlayerStacks(self) hhc.compilePlayerRegexs(self) hhc.markStreets(self) @@ -1105,6 +1109,8 @@ class StudHand(Hand): # which then invokes a 'addXXX' callback if builtFrom == "HHC": hhc.readHandInfo(self) + if self.gametype['type'] == 'tour': + self.tablename = "%s %s" % (self.tourNo, self.tablename) hhc.readPlayerStacks(self) hhc.compilePlayerRegexs(self) hhc.markStreets(self) diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py index ec480831..76705839 100644 --- a/pyfpdb/fpdb_import.py +++ b/pyfpdb/fpdb_import.py @@ -449,7 +449,9 @@ class Importer: # Call hudcache update if not in bulk import mode # FIXME: Need to test for bulk import that isn't rebuilding the cache if self.callHud: - hand.updateHudCache(self.database) + for hand in handlist: + if hand is not None: + hand.updateHudCache(self.database) self.database.commit() #pipe the Hands.id out to the HUD