diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c3f2b83ce..b37856507 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20070112
 --------
 main/ip_base.cpp: Fixed port deformation while sending handshake
+main/inferno.c: Fixed some command-line options
 
 20071008
 --------
diff --git a/main/inferno.c b/main/inferno.c
index d2786ed5b..f0ae44827 100644
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -288,13 +288,12 @@ int main(int argc,char **argv)
 
 	key_init();
 
-	if (!GameArg.SndNoSound) {
-		digi_select_system(
-			GameArg.SndSdlMixer || GameArg.SndExternalMusic || GameArg.SndJukebox ?
-			SDLMIXER_SYSTEM : SDLAUDIO_SYSTEM
-		);
+	digi_select_system(
+		GameArg.SndSdlMixer || GameArg.SndExternalMusic || GameArg.SndJukebox ?
+		SDLMIXER_SYSTEM : SDLAUDIO_SYSTEM
+	);
+	if (!GameArg.SndNoSound)
 		digi_init();
-	}
 	
 	if (!GameArg.CtlNoMouse)
 		d_mouse_init();