diff -r 3445ce5e9c79 -r 9572aae13d49 QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Tue Feb 09 02:03:31 2010 +0000
+++ b/QTfrontend/hwform.cpp	Tue Feb 09 03:21:09 2010 +0000
@@ -637,12 +637,12 @@
 		ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&)));
 
 // nick list stuff
-	connect(hwnet, SIGNAL(nickAdded(const QString&)),
-		ui.pageNetGame->pChatWidget, SLOT(nickAdded(const QString&)));
+	connect(hwnet, SIGNAL(nickAdded(const QString&, bool)),
+		ui.pageNetGame->pChatWidget, SLOT(nickAdded(const QString&, bool)));
 	connect(hwnet, SIGNAL(nickRemoved(const QString&)),
 		ui.pageNetGame->pChatWidget, SLOT(nickRemoved(const QString&)));
-	connect(hwnet, SIGNAL(nickAddedLobby(const QString&)),
-		ui.pageRoomsList->chatWidget, SLOT(nickAdded(const QString&)));
+	connect(hwnet, SIGNAL(nickAddedLobby(const QString&, bool)),
+		ui.pageRoomsList->chatWidget, SLOT(nickAdded(const QString&, bool)));
 	connect(hwnet, SIGNAL(nickRemovedLobby(const QString&)),
 		ui.pageRoomsList->chatWidget, SLOT(nickRemoved(const QString&)));
 
@@ -793,7 +793,7 @@
 		case gsFinished: {
 			//setVisible(true);
 			GoBack();
-			Music(ui.pageOptions->CBEnableMusic->isChecked());
+			Music(ui.pageOptions->CBEnableFrontendMusic->isChecked());
 			if (wBackground) wBackground->startAnimation();
 			GoToPage(ID_PAGE_GAMESTATS);
 			if (hwnet) hwnet->gameFinished();
@@ -804,7 +804,7 @@
 			quint8 id = ui.Pages->currentIndex();
 			if (id == ID_PAGE_INGAME) {
 				GoBack();
-				Music(ui.pageOptions->CBEnableMusic->isChecked());
+				Music(ui.pageOptions->CBEnableFrontendMusic->isChecked());
 				if (wBackground) wBackground->startAnimation();
 				if (hwnet) hwnet->gameFinished();
 			}