Index: trunk/fl5/src/com/longtailvideo/jwplayer/controller/Controller.as
===================================================================
--- trunk/fl5/src/com/longtailvideo/jwplayer/controller/Controller.as	(revision 1252)
+++ trunk/fl5/src/com/longtailvideo/jwplayer/controller/Controller.as	(revision 1301)
@@ -303,16 +303,18 @@
 					finalizeSetup();
 				}
-				if (!locking && (_lockingResume || _unlockAutostart)) {
-					_lockingResume = false;
+				if (!locking) {
 					if (_unlockAndLoad) {
 						load(_player.playlist.currentItem);
 						_unlockAndLoad = false;
 					}
-					play();
-					if (_unlockAutostart) {
-						_unlockAutostart = false;
+					if (_lockingResume || _unlockAutostart) {
+						_lockingResume = false;
+						play();
+						if (_unlockAutostart) {
+							_unlockAutostart = false;
+						}
 					}
-				}
-				return true;
+					return true;
+				}
 			}
 			return false;