[Slim-Checkins] r11078 - /trunk/server/Slim/Buttons/Common.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Tue Jan  2 04:22:40 2007
New Revision: 11078

URL: http://svn.slimdevices.com?rev=11078&view=rev
Log:
Bug: N/A
Description: tidy up mode stacks if setMode function failed so stay in
previous mode

Modified:
    trunk/server/Slim/Buttons/Common.pm

Modified: trunk/server/Slim/Buttons/Common.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Buttons/Common.pm?rev=11078&r1=11077&r2=11078&view=diff
==============================================================================
--- trunk/server/Slim/Buttons/Common.pm (original)
+++ trunk/server/Slim/Buttons/Common.pm Tue Jan  2 04:22:40 2007
@@ -1597,6 +1597,12 @@
 
 	if ($@) {
 		logError("Couldn't push into new mode: [$setmode] !: $@");
+
+		pop @{$scrollClientHash->{$client}{scrollParamsStack}};
+		pop @{$client->modeStack};
+		pop @{$client->modeParameterStack};
+
+		return;
 	}
 
 	if ($client->display->hasScreen2) {