Merge branch 'nuto'
This commit is contained in:
commit
787e351b43
|
@ -266,7 +266,7 @@ class HUD_main(object):
|
||||||
cards = self.get_cards(new_hand_id)
|
cards = self.get_cards(new_hand_id)
|
||||||
table_kwargs = dict(table_name=table_name, tournament=tour_number, table_number=tab_number)
|
table_kwargs = dict(table_name=table_name, tournament=tour_number, table_number=tab_number)
|
||||||
tablewindow = Tables.Table(self.config, site_name, **table_kwargs)
|
tablewindow = Tables.Table(self.config, site_name, **table_kwargs)
|
||||||
if tablewindow is None:
|
if tablewindow.number is None:
|
||||||
# If no client window is found on the screen, complain and continue
|
# If no client window is found on the screen, complain and continue
|
||||||
if type == "tour":
|
if type == "tour":
|
||||||
table_name = "%s %s" % (tour_number, tab_number)
|
table_name = "%s %s" % (tour_number, tab_number)
|
||||||
|
|
|
@ -34,9 +34,13 @@ import gtk
|
||||||
import gobject
|
import gobject
|
||||||
|
|
||||||
# FreePokerTools modules
|
# FreePokerTools modules
|
||||||
|
import Configuration
|
||||||
from HandHistoryConverter import getTableTitleRe
|
from HandHistoryConverter import getTableTitleRe
|
||||||
from HandHistoryConverter import getTableNoRe
|
from HandHistoryConverter import getTableNoRe
|
||||||
|
|
||||||
|
c = Configuration.Config()
|
||||||
|
log = Configuration.get_logger("logging.conf", "hud", log_dir=c.dir_log, log_file='HUD-log.txt')
|
||||||
|
|
||||||
# Global used for figuring out the current game being played from the title.
|
# Global used for figuring out the current game being played from the title.
|
||||||
# The dict key is a tuple of (limit type, category) for the game.
|
# The dict key is a tuple of (limit type, category) for the game.
|
||||||
# The list is the names for those games used by the supported poker sites
|
# The list is the names for those games used by the supported poker sites
|
||||||
|
|
|
@ -128,7 +128,7 @@ class Table(Table_Window):
|
||||||
des_re = 'No such window with id'
|
des_re = 'No such window with id'
|
||||||
|
|
||||||
listing = os.popen("xwininfo -id %d -stats" % (self.number)).read()
|
listing = os.popen("xwininfo -id %d -stats" % (self.number)).read()
|
||||||
|
if listing == "": return
|
||||||
mo = re.search(des_re, listing)
|
mo = re.search(des_re, listing)
|
||||||
if mo is not None:
|
if mo is not None:
|
||||||
return None # table has been destroyed
|
return None # table has been destroyed
|
||||||
|
|
Loading…
Reference in New Issue
Block a user