From 531a572b9fcf201c2f30e889352a09742fded9be Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Mon, 17 Jun 2013 20:34:03 +0000
Subject: Avoid crash on activity close

This is a ugly hack, but works. If we found a better option,
should replace it. Try to quit pygame at activity shutdown,
instead of doing gtk.main_quit() when pygame ends.

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
---
diff --git a/activity.py b/activity.py
index 127e73f..68d73d3 100755
--- a/activity.py
+++ b/activity.py
@@ -92,8 +92,13 @@ class MazeActivity(olpcgames.PyGameActivity):
         self.set_toolbar_box(toolbar_box)
         toolbar_box.show_all()
 
+        self.connect("destroy", self.__stop_pygame)
+
         return toolbar_box
 
+    def __stop_pygame(self, widget):
+        pygame.quit()
+
     def _easier_button_cb(self, button):
         pygame.event.post(olpcgames.eventwrap.Event(
             pygame.USEREVENT, action='easier_button'))
diff --git a/olpcgames/canvas.py b/olpcgames/canvas.py
index 9f9983c..4d93343 100644
--- a/olpcgames/canvas.py
+++ b/olpcgames/canvas.py
@@ -136,7 +136,7 @@ class PygameCanvas(gtk.Layout):
                 eventwrap.clear()
         finally:
             log.info( 'Main function finished, calling main_quit' )
-            gtk.main_quit()
+            # gtk.main_quit()
 
     source_object_id = None
     def view_source(self):
--
cgit v0.9.1