gcompris r3801 - in branches/gcomprixogoo: . src/memory-activity

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Thu Mar 26 22:31:01 2009
New Revision: 3801
URL: http://svn.gnome.org/viewvc/gcompris?rev=3801&view=rev

Log:
	* src/boards/memory.c: (sound_callback): Hopefully fixed a race in which
	  tux could play several time alone or stop after a single play.
	  Merged from trunk 3800



Modified:
   branches/gcomprixogoo/ChangeLog
   branches/gcomprixogoo/src/memory-activity/memory.c

Modified: branches/gcomprixogoo/src/memory-activity/memory.c
==============================================================================
--- branches/gcomprixogoo/src/memory-activity/memory.c	(original)
+++ branches/gcomprixogoo/src/memory-activity/memory.c	Thu Mar 26 22:31:01 2009
@@ -1102,11 +1102,11 @@
   win_id = 0;
 
   if (currentMode == MODE_TUX){
+    to_tux = FALSE;
     if (tux_id) {
       g_source_remove (tux_id);
     }
     tux_id =0;
-    to_tux = FALSE;
   }
 
   /* Now destroy all items */
@@ -1793,6 +1793,9 @@
     return TRUE;
   }
 
+  if ( ! to_tux )
+    return TRUE;
+
   if(secondCard)
     {
       display_card(firstCard, ON_BACK);
@@ -1884,6 +1887,9 @@
   if (! gcomprisBoard)
     return;
 
+  if (!playing_sound)
+    return;
+
   playing_sound = FALSE;
   if (currentMode == MODE_TUX){
     if (to_tux) {