From ce01d9f98a0d71340b2dfacd2f2af2dab7a454f9 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Wed, 18 Dec 2013 22:27:27 +0000
Subject: some small tweaks from the Turtle Confusion upgrade

---
diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py
index d66345b..a7dbd5b 100644
--- a/TurtleArt/tabasics.py
+++ b/TurtleArt/tabasics.py
@@ -196,8 +196,8 @@ turtle'))
                                     Primitive(self.tw.lc.reset_scale),
                                     Primitive(self.tw.lc.reset_timer),
                                     Primitive(self.tw.lc.clear_value_blocks),
-                                    Primitive(self.tw.lc.reset_internals),
                                     Primitive(self.tw.canvas.clearscreen),
+                                    Primitive(self.tw.lc.reset_internals),
                                     Primitive(self.tw.turtles.reset_turtles),
                                     Primitive(self.tw.lc.active_turtle)
                                 ])]))
diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index 5792043..ec6e7e7 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -675,9 +675,9 @@ class LogoCode:
         self.reset_scale()
         self.reset_timer()
         self.clear_value_blocks()
-        self.reset_internals()
         self.tw.canvas.clearscreen()
         self.tw.turtles.reset_turtles()
+        self.reset_internals()
 
     def stop_playing_media(self):
         if self.tw.gst_available:
diff --git a/turtleblocks.py b/turtleblocks.py
index 051d447..01ddbd3 100755
--- a/turtleblocks.py
+++ b/turtleblocks.py
@@ -517,7 +517,8 @@ return %s(self)" % (p, P, P)
             elif resp == gtk.RESPONSE_CANCEL:
                 return
 
-        self.client.set_int(self._ORIENTATION, self.tw.orientation)
+        if hasattr(self, 'client'):
+            self.client.set_int(self._ORIENTATION, self.tw.orientation)
 
         for plugin in self.tw.turtleart_plugins:
             if hasattr(plugin, 'quit'):
@@ -719,7 +720,9 @@ Would you like to save before quitting?'))
             default_values['arc'] = [90, 100]
             default_values['setpensize'] = [5]
             self.tw.turtles.get_active_turtle().set_pen_size(5)
-        self.client.set_int(self._COORDINATE_SCALE, int(self.tw.coord_scale))
+        if hasattr(self, 'client'):
+            self.client.set_int(self._COORDINATE_SCALE,
+                                int(self.tw.coord_scale))
 
     def _do_toggle_hover_help_cb(self, button):
         ''' Toggle hover help on/off '''
--
cgit v0.9.1