From 0e793b510a2a61759cccf4caa38d9651eae1018b Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 18 Mar 2006 04:01:37 +0000
Subject: merge up to r3928, branch should be closeable unless there are major
 issues that need to be addressed.

git-svn-id: https://svn.musicpd.org/mpd/branches/oggflac@3929 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
 src/main.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 7b05e7c14..2f0bf870a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -220,7 +220,7 @@ void changeToUser() {
                  * (must be done before we change our uid)
                  */
                 if (initgroups(param->value, userpwd->pw_gid) == -1) {
-                        WARNING("cannot init suplementary groups "
+                        WARNING("cannot init supplementary groups "
                                         "of user \"%s\" at line %i: %s\n", 
 					param->value, param->line, 
                                         strerror(errno));
@@ -300,7 +300,6 @@ void startMainProcess() {
         if(pid>0) {
 		initInputStream(); 
 	        initReplayGainState();
-		/* qball crappy code */
 		readAudioDevicesState();
 
 		/* free stuff we don't need */
@@ -317,9 +316,6 @@ void startMainProcess() {
 		finishAudioConfig();
 		finishAudioDriver();
 	
-		/* qball crappy code */
-		saveAudioDevicesState();
-	
 		finishPaths();
 
 		kill(mainPid, SIGTERM);
-- 
cgit v1.2.3