Index: Changelog6.html
===================================================================
--- Changelog6.html	(revision 10225)
+++ Changelog6.html	(working copy)
@@ -62,6 +62,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4270">#4270</a> - Server Information on SB - two items muddled up</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4281">#4281</a> - Mix do not work with accented characters in filenames and paths</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4291">#4291</a> - if you change the http or cli port, mdns doesn't update its advertisements</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4309">#4309</a> - Sort genres by name in Random Mix</li>
 	</ul>
 </ul>
 
Index: Plugins/RandomPlay/Plugin.pm
===================================================================
--- Plugins/RandomPlay/Plugin.pm	(revision 10225)
+++ Plugins/RandomPlay/Plugin.pm	(working copy)
@@ -152,11 +152,11 @@
 		my $id   = $genre->id;
 		my $ena  = 1;
 
-		if (grep { $_ eq $id } @exclude) {
+		if (grep { $_ eq $name } @exclude) {
 			$ena = 0;
 		}
 
-		$clientGenres{$id} = {
+		$clientGenres{$name} = {
 			'id'      => $id,
 			'name'    => $name,
 			'enabled' => $ena,
@@ -819,9 +819,9 @@
 	my $genres = getGenres($client);
 
 	# %$params will contain a key called genre_<genre id> for each ticked checkbox on the page
-	foreach my $genre (keys %{$params}) {
+	for my $genre (keys %{$genres}) {
 
-		if ($genre =~ s/^genre_//) {
+		if (!$params->{'genre_'.$genres->{$genre}->{'id'}}) {
 			delete($genres->{$genre});
 		}
 	}