Index: Squeezebox.pm
===================================================================
--- Squeezebox.pm	(revision 20426)
+++ Squeezebox.pm	(working copy)
@@ -1123,6 +1123,12 @@
 
 		$log->debug("flags: $flags");
 
+		my $transitionType = $prefs->client($client)->get('transitionType') || 0;
+		# If we need to determine dynamically
+		if ($prefs->client($client)->get('transitionSmart') && (Slim::Player::ReplayGain->trackAlbumMatch($client, -1) || Slim::Player::ReplayGain->trackAlbumMatch($client, 1))) {
+			$transitionType = 0;
+		}
+
 		my $frame = pack 'aaaaaaaCCCaCCCNnN', (
 			$command,	# command
 			$autostart,
@@ -1134,7 +1140,7 @@
 			$bufferThreshold,
 			0,		# s/pdif auto
 			$prefs->client($client)->get('transitionDuration') || 0,
-			$prefs->client($client)->get('transitionType') || 0,
+			$transitionType,
 			$flags,		# flags	     
 			$outputThreshold,
 			0,		# reserved