diff options
Diffstat (limited to 'TurtleArt')
| -rw-r--r-- | TurtleArt/tautils.py | 6 | ||||
| -rw-r--r-- | TurtleArt/tawindow.py | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py index b520907..ff9ae7e 100644 --- a/TurtleArt/tautils.py +++ b/TurtleArt/tautils.py @@ -342,12 +342,12 @@ def chooser_dialog(parent_window, filter, action): chooser.destroy() del chooser - if dsobject is not None: - gobject.idle_add(_take_action, action, dsobject) + gobject.idle_add(_take_action, action, dsobject) def _take_action(action, dsobject): action(dsobject) - dsobject.destroy() + if dsobject is not None: + dsobject.destroy() def data_from_file(ta_file): ''' Open the .ta file, ignoring any .png file that might be present. ''' diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index e4c7b65..064df2f 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -3370,8 +3370,9 @@ before making changes to your Turtle Blocks program')) def _update_media_blk(self, dsobject): ''' Called from the chooser to load a media block ''' - self._update_media_icon(self.selected_blk, dsobject, - dsobject.object_id) + if dsobject is not None: + self._update_media_icon(self.selected_blk, dsobject, + dsobject.object_id) def _update_media_icon(self, blk, name, value=''): ''' Update the icon on a 'loaded' media block. ''' @@ -3700,6 +3701,8 @@ before making changes to your Turtle Blocks program')) def load_python_code_from_journal(self, dsobject, blk=None): ''' Read the Python code from the Journal object ''' self.python_code = None + if dsobject is None: + return try: file_handle = open(dsobject.file_path, "r") self.python_code = file_handle.read() |