Index: libs/libmythtv/NuppelVideoPlayer.cpp =================================================================== --- libs/libmythtv/NuppelVideoPlayer.cpp (revision 9772) +++ libs/libmythtv/NuppelVideoPlayer.cpp (working copy) @@ -328,6 +328,7 @@ void NuppelVideoPlayer::SetWatchingRecording(bool mode) { + QMutexLocker locker(&decoder_change_lock); watchingrecording = mode; if (GetDecoder()) GetDecoder()->setWatchingRecording(mode); @@ -5857,6 +5858,12 @@ void NuppelVideoPlayer::SetDecoder(DecoderBase *dec) { //VERBOSE(VB_IMPORTANT, "SetDecoder("<