@@ -85,7 +85,9 @@ Game::Game(const std::string &title) : _screen(0), _cursor(0), _lang(0), _states
 		else
 		{
 			Mix_AllocateChannels(16);
-			Mix_ReserveChannels(1);
+			// Set up UI channels
+			Mix_ReserveChannels(2);
+			Mix_GroupChannels(0, 1, 0);
 			Log(LOG_INFO) << "SDL_mixer initialized successfully.";
 		}
 	}
@@ -384,11 +386,18 @@ void Game::setVolume(int sound, int music, int ui)
 	if (!Options::mute)
 	{
 		if (sound >= 0)
+		{
 			Mix_Volume(-1, sound);
+		}
 		if (music >= 0)
+		{
 			Mix_VolumeMusic(music);
+		}
 		if (ui >= 0)
+		{
 			Mix_Volume(0, ui);
+			Mix_Volume(1, ui);
+		}
 	}
 }
 
 
@@ -18,6 +18,7 @@
  */
 #include "TextButton.h"
 #include <SDL.h>
+#include <SDL_mixer.h>
 #include "Text.h"
 #include "../Engine/Sound.h"
 #include "../Engine/Action.h"
@@ -280,7 +281,7 @@ void TextButton::mousePress(Action *action, State *state)
 		if (soundPress != 0 && _group == 0 &&
 			action->getDetails()->button.button != SDL_BUTTON_WHEELUP && action->getDetails()->button.button != SDL_BUTTON_WHEELDOWN)
 		{
-			soundPress->play(0);
+			soundPress->play(Mix_GroupAvailable(0));
 		}
 
 		if (_comboBox)
 
@@ -18,6 +18,7 @@
  */
 #include "Window.h"
 #include <SDL.h>
+#include <SDL_mixer.h>
 #include "../aresame.h"
 #include "../Engine/Timer.h"
 #include "../Engine/Sound.h"
@@ -133,7 +134,7 @@ void Window::popup()
 		int sound = RNG::generate(0, 2);
 		if (soundPopup[sound] != 0)
 		{
-			soundPopup[sound]->play(0);
+			soundPopup[sound]->play(Mix_GroupAvailable(0));
 		}
 	}
 	if (_popupStep < 1.0)
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,9 @@ Game::Game(const std::string &title) : _screen(0), _cursor(0), _lang(0), _states`
`85`	`85`	`else`
`86`	`86`	`{`
`87`	`87`	`Mix_AllocateChannels(16);`
`88`		`- Mix_ReserveChannels(1);`
	`88`	`+ // Set up UI channels`
	`89`	`+ Mix_ReserveChannels(2);`
	`90`	`+ Mix_GroupChannels(0, 1, 0);`
`89`	`91`	`Log(LOG_INFO) << "SDL_mixer initialized successfully.";`
`90`	`92`	`}`
`91`	`93`	`}`
`@@ -384,11 +386,18 @@ void Game::setVolume(int sound, int music, int ui)`
`384`	`386`	`if (!Options::mute)`
`385`	`387`	`{`
`386`	`388`	`if (sound >= 0)`
	`389`	`+ {`
`387`	`390`	`Mix_Volume(-1, sound);`
	`391`	`+ }`
`388`	`392`	`if (music >= 0)`
	`393`	`+ {`
`389`	`394`	`Mix_VolumeMusic(music);`
	`395`	`+ }`
`390`	`396`	`if (ui >= 0)`
	`397`	`+ {`
`391`	`398`	`Mix_Volume(0, ui);`
	`399`	`+ Mix_Volume(1, ui);`
	`400`	`+ }`
`392`	`401`	`}`
`393`	`402`	`}`
`394`	`403`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`#include "Window.h"`
`20`	`20`	`#include <SDL.h>`
	`21`	`+#include <SDL_mixer.h>`
`21`	`22`	`#include "../aresame.h"`
`22`	`23`	`#include "../Engine/Timer.h"`
`23`	`24`	`#include "../Engine/Sound.h"`
`@@ -133,7 +134,7 @@ void Window::popup()`
`133`	`134`	`int sound = RNG::generate(0, 2);`
`134`	`135`	`if (soundPopup[sound] != 0)`
`135`	`136`	`{`
`136`		`- soundPopup[sound]->play(0);`
	`137`	`+ soundPopup[sound]->play(Mix_GroupAvailable(0));`
`137`	`138`	`}`
`138`	`139`	`}`
`139`	`140`	`if (_popupStep < 1.0)`