Fix for crash after closing debug window.

This commit is contained in:
MikeTheWatchGuy 2018-12-07 20:25:30 -05:00
parent 73e7af3099
commit 9b98b8e6b9
1 changed files with 4 additions and 8 deletions

View File

@ -2647,17 +2647,11 @@ class Table(Element):
:param max_col_width: :param max_col_width:
:param select_mode: :param select_mode:
:param display_row_numbers: :param display_row_numbers:
:param num_rows:
:param row_height:
:param font: :param font:
:param justification: :param justification:
:param text_color: :param text_color:
:param background_color: :param background_color:
:param alternating_row_color:
:param size: :param size:
:param change_submits:
:param enable_events:
:param bind_return_key:
:param pad: :param pad:
:param key: :param key:
:param tooltip: :param tooltip:
@ -3013,7 +3007,7 @@ class Window(object):
return self return self
def LayoutAndRead(self, rows, non_blocking=False): def LayoutAndRead(self, rows, non_blocking=False):
raise DeprecationWarning('LayoutAndRead is no longer supported... change your call window.Layout(layout).Read()') raise DeprecationWarning('LayoutAndReaLayoutAndRead is no longer supported... change your call window.Layout(layout).Read()')
# self.AddRows(rows) # self.AddRows(rows)
# self.Show(non_blocking=non_blocking) # self.Show(non_blocking=non_blocking)
# return self.ReturnValues # return self.ReturnValues
@ -5531,6 +5525,8 @@ class DebugWin(object):
self.Close() self.Close()
def Close(self): def Close(self):
if self.window is None:
return
self.window.Close() self.window.Close()
self.window.__del__() self.window.__del__()
self.window = None self.window = None
@ -6953,7 +6949,7 @@ def PopupGetFolder(message, title=None, default_path='', no_window=False, size=(
font=font, no_titlebar=no_titlebar, grab_anywhere=grab_anywhere, keep_on_top=keep_on_top, font=font, no_titlebar=no_titlebar, grab_anywhere=grab_anywhere, keep_on_top=keep_on_top,
location=location) location=location)
(button, input_values) = window.LayoutAndRead(layout) (button, input_values) = window.Layout(layout).Read()
if button != 'Ok': if button != 'Ok':
return None return None