summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorRachel Bryk <RachelBryk@gmail.com>2013-09-05 16:09:56 -0400
committerRachel Bryk <RachelBryk@gmail.com>2013-09-05 16:09:56 -0400
commit3baab41cf43213df83eb9a4aa28eedbbbd23ec44 (patch)
tree3495b814b6b910f7fa27833cc237a29a481a21dd /Source/Core
parentb2657f6a9b00a82f2c0baafdc7794487cce8fcbf (diff)
Allow input display to work with netplay even when not recording.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Src/NetPlayClient.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/Core/Core/Src/NetPlayClient.cpp b/Source/Core/Core/Src/NetPlayClient.cpp
index 2889a44323..7a3febe030 100644
--- a/Source/Core/Core/Src/NetPlayClient.cpp
+++ b/Source/Core/Core/Src/NetPlayClient.cpp
@@ -557,8 +557,15 @@ bool NetPlayClient::GetNetPads(const u8 pad_nb, const SPADStatus* const pad_stat
tmp.substickY = ((u8*)&netvalues->nLo)[2];
tmp.triggerLeft = ((u8*)&netvalues->nLo)[1];
tmp.triggerRight = ((u8*)&netvalues->nLo)[0];
- Movie::RecordInput(&tmp, pad_nb);
- Movie::InputUpdate();
+ if (Movie::IsRecordingInput())
+ {
+ Movie::RecordInput(&tmp, pad_nb);
+ Movie::InputUpdate();
+ }
+ else
+ {
+ Movie::CheckPadStatus(&tmp, pad_nb);
+ }
return true;
}