evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.assembla.com/free_poker_tools

Browse Source 
Conflicts:
	pyfpdb/TableWindow.py
This commit is contained in:
Worros 2010-12-11 09:16:37 +08:00
commit aeaf64e469
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pyfpdb/HUD_main.pyw
View File

@ -282,6 +282,7 @@ class HUD_main(object):
table_name = "%s %s" % (tour_number, tab_number) table_name = "%s %s" % (tour_number, tab_number)
log.error("HUD create: table name %s not found, skipping." % table_name) log.error("HUD create: table name %s not found, skipping." % table_name)
else: else:
tablewindow.key = temp_key
tablewindow.max = max tablewindow.max = max
tablewindow.site = site_name tablewindow.site = site_name
# Test that the table window still exists # Test that the table window still exists
@ -328,9 +329,9 @@ def idle_kill(hud_main, table):
gtk.gdk.threads_enter() gtk.gdk.threads_enter()
try: try:
if table in hud_main.hud_dict: if table in hud_main.hud_dict:
hud_main.hud_dict[table].kill()
hud_main.hud_dict[table].main_window.destroy()
hud_main.vb.remove(hud_main.hud_dict[table].tablehudlabel) hud_main.vb.remove(hud_main.hud_dict[table].tablehudlabel)
hud_main.hud_dict[table].main_window.destroy()
hud_main.hud_dict[table].kill()
del(hud_main.hud_dict[table]) del(hud_main.hud_dict[table])
hud_main.main_window.resize(1, 1) hud_main.main_window.resize(1, 1)
except: except:

7
pyfpdb/TableWindow.py
View File

@ -124,13 +124,11 @@ class Table_Window(object):
self.type = "tour" self.type = "tour"
table_kwargs = dict(tournament = self.tournament, table_number = self.table) table_kwargs = dict(tournament = self.tournament, table_number = self.table)
self.tableno_re = getTableNoRe(self.config, self.site, tournament = self.tournament) self.tableno_re = getTableNoRe(self.config, self.site, tournament = self.tournament)
self.key = tournament # used as key for the hud_dict in HUD_main
elif table_name is not None: elif table_name is not None:
self.name = table_name self.name = table_name
self.type = "cash" self.type = "cash"
self.tournament = None self.tournament = None
table_kwargs = dict(table_name = table_name) table_kwargs = dict(table_name = table_name)
self.key = table_name
else: else:
return None return None
@ -138,10 +136,7 @@ class Table_Window(object):
self.search_string = getTableTitleRe(self.config, self.site, self.type, **table_kwargs) self.search_string = getTableTitleRe(self.config, self.site, self.type, **table_kwargs)
self.find_table_parameters() self.find_table_parameters()
try: # self.gdkhandle = gtk.gdk.window_foreign_new(self.number)
self.gdkhandle = gtk.gdk.window_foreign_new(self.number)
except AttributeError: # self.number does not exist, table was closed
return None
geo = self.get_geometry() geo = self.get_geometry()
if geo is None: return None if geo is None: return None
self.width = geo['width'] self.width = geo['width']