diff --git a/SConstruct b/SConstruct
index c0c3fde6..6f018a3a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -10,7 +10,7 @@ opts.AddVariables(
   BoolVariable('DEBUG',     'Build with debugging symbols', 1),
   BoolVariable('LUA',       'Enable Lua support', 1),
   BoolVariable('NEWPPU',    'Enable new PPU core', 1),
-  BoolVariable('CREATE_AVI', 'Enable avi creation support (SDL only)', 0),
+  BoolVariable('CREATE_AVI', 'Enable avi creation support (SDL only)', 1),
   BoolVariable('LOGO', 'Enable a logoscreen when creating avis (SDL only)', '1'),
   BoolVariable('GTK', 'Enable GTK2 GUI (SDL only)', 1),
   BoolVariable('GTK_LITE', 'Enable GTK2 for dialogs only', 0)
diff --git a/src/drivers/sdl/gui.cpp b/src/drivers/sdl/gui.cpp
index b1bed10f..e361133d 100644
--- a/src/drivers/sdl/gui.cpp
+++ b/src/drivers/sdl/gui.cpp
@@ -969,7 +969,8 @@ void toggleSound(GtkWidget* check, gpointer data)
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check)))
 	{
 		g_config->setOption("SDL.Sound", 1);
-		InitSound();
+		if(GameInfo)		
+			InitSound();
 	}
 	else
 	{