Commit 60930483 authored by Bruno Coudoin's avatar Bruno Coudoin

Hopefully fixed a race in which tux could play several time alone or stop

	* 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


svn path=/branches/gcomprixogoo/; revision=3801
parent 3850a8d6
2009-03-26 Bruno coudoin <bruno.coudoin@free.fr>
* 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
2009-03-25 Bruno coudoin <bruno.coudoin@free.fr>
* src/boards/memory.c: (start_board), (memory_next_level): fixed a cased in which
......
......@@ -1102,11 +1102,11 @@ static void memory_destroy_all_items()
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 @@ static gint tux_play(){
return TRUE;
}
if ( ! to_tux )
return TRUE;
if(secondCard)
{
display_card(firstCard, ON_BACK);
......@@ -1884,6 +1887,9 @@ static void sound_callback(gchar *file)
if (! gcomprisBoard)
return;
if (!playing_sound)
return;
playing_sound = FALSE;
if (currentMode == MODE_TUX){
if (to_tux) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment