diff -Naur libmythtvclone/tv_rec.cpp libmythtv/tv_rec.cpp
old
|
new
|
|
1253 | 1253 | /// \brief Event handling method, contains event loop. |
1254 | 1254 | void TVRec::run(void) |
1255 | 1255 | { |
| 1256 | QMutexLocker mylocker(&myLock); |
1256 | 1257 | QMutexLocker lock(&stateChangeLock); |
1257 | 1258 | SetFlags(kFlagRunMainLoop); |
1258 | 1259 | ClearFlags(kFlagExitPlayer | kFlagFinishRecording); |
… |
… |
|
3933 | 3934 | |
3934 | 3935 | ClearFlags(kFlagNeedToStartRecorder); |
3935 | 3936 | newRecStatus = rsFailed; |
3936 | | |
| 3937 | return NULL; |
3937 | 3938 | if (scanner && HasFlags(kFlagEITScannerRunning)) |
3938 | 3939 | { |
3939 | 3940 | scanner->StopActiveScan(); |
diff -Naur libmythtvclone/tv_rec.h libmythtv/tv_rec.h
old
|
new
|
|
362 | 362 | // State variables |
363 | 363 | mutable QMutex setChannelLock; |
364 | 364 | mutable QMutex stateChangeLock; |
| 365 | mutable QMutex myLock; |
365 | 366 | mutable QMutex pendingRecLock; |
366 | 367 | TVState internalState; |
367 | 368 | TVState desiredNextState; |