Merge branch 'master' of git://git.assembla.com/fpdb-sql

This commit is contained in:
Worros 2009-09-23 13:22:45 +08:00
commit a20bfe0921
2 changed files with 6 additions and 2 deletions

View File

@ -1014,7 +1014,9 @@ class Database:
elif self.backend == self.PGSQL:
c.execute("insert into TourneyTypes values (0,1,0,0,0,False,False,null,False,False,False);")
else:
c.execute("insert into TourneyTypes values (0,1,0,0,0,0,0,null,0,0,0);")
c.execute("""insert into TourneyTypes(id, siteId, buyin, fee, maxSeats, knockout
,rebuyOrAddon, speed, headsUp, shootout, matrix)
values (1, 1, 0, 0, 0, False, False, null, False, False, False);""")
#end def fillDefaultData

View File

@ -473,7 +473,9 @@ class Flop_Mucked(Aux_Seats):
self.displayed = True
if i != "common":
id = self.get_id_from_seat(i)
self.m_windows[i].eb.set_tooltip_text(self.hud.stat_dict[id]['screen_name'])
# sc: had KeyError here with new table so added id != None test as a guess:
if id != None:
self.m_windows[i].eb.set_tooltip_text(self.hud.stat_dict[id]['screen_name'])
def update_gui(self, new_hand_id):
"""Prepare and show the mucked cards."""