diff options
| author | Rachel Bryk <RachelBryk@gmail.com> | 2013-09-22 10:58:24 -0400 |
|---|---|---|
| committer | Rachel Bryk <RachelBryk@gmail.com> | 2013-09-22 10:58:24 -0400 |
| commit | 75129dc3a7e2a9f37adccc5486768f7fefd767f1 (patch) | |
| tree | b4f0c56348b3fc3be7cf9ae172d6c2a8bacd61b1 /Source | |
| parent | 2395725200a298c3db178f9d8517a487f15a8df2 (diff) | |
| parent | dc73222bfc7c04530e32c82b8ad49d8a7d66b055 (diff) | |
Merge branch 'to-merge-after-4.0'
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Src/Movie.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp index 9f3ca7e795..129785d5a2 100644 --- a/Source/Core/Core/Src/Movie.cpp +++ b/Source/Core/Core/Src/Movie.cpp @@ -1040,7 +1040,8 @@ bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, if (size != sizeInMovie) { - PanicAlertT("Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s", (u32)sizeInMovie, (u32)size, (u32)g_currentByte, (g_numPads & 0xF)?" Try re-creating the recording with all GameCube controllers disabled (in Configure > Gamecube > Device Settings), or restarting Dolphin (Dolphin currently must be restarted every time before playing back a wiimote movie).":""); + PanicAlertT("Fatal desync. Aborting playback. (Error in PlayWiimote: %u != %u, byte %u.)%s", (u32)sizeInMovie, (u32)size, (u32)g_currentByte, + (g_numPads & 0xF)?" Try re-creating the recording with all GameCube controllers disabled (in Configure > Gamecube > Device Settings)." : ""); EndPlayInput(!g_bReadOnly); return false; } |