diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2015-02-14 02:18:21 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2015-02-14 02:18:21 +0100 |
| commit | 4d3c1c7ec347d7dc6b8786be7f1b7c7effbd2d44 (patch) | |
| tree | 1710c65eb11c16bbaacc63c4849c0c52fff44b0a /Source | |
| parent | 4ceae5771310286779b2eb58656330b50053ff51 (diff) | |
| parent | b66df8424a7d8902afd011a60c684d7c8e6f3ea8 (diff) | |
Merge pull request #2048 from RachelBryk/less-of-a-clusterfuck
Remove an unneeded global variable from Movie.cpp.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Movie.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 8540133f0a..2121a85de3 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -79,8 +79,6 @@ static u32 s_DSPcoefHash = 0; static bool s_bRecordingFromSaveState = false; static bool s_bPolled = false; -static std::string tmpStateFilename = File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav"; - static std::string s_InputDisplay[8]; static GCManipFunction gcmfunc = nullptr; @@ -469,10 +467,10 @@ bool BeginRecordingInput(int controllers) if (Core::IsRunningAndStarted()) { - if (File::Exists(tmpStateFilename)) - File::Delete(tmpStateFilename); + if (File::Exists(File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav")) + File::Delete(File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav"); - State::SaveAs(tmpStateFilename); + State::SaveAs(File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav"); s_bRecordingFromSaveState = true; // This is only done here if starting from save state because otherwise we won't have the titleid. Otherwise it's set in WII_IPC_HLE_Device_es.cpp. @@ -1242,7 +1240,7 @@ void SaveRecording(const std::string& filename) if (success && s_bRecordingFromSaveState) { std::string stateFilename = filename + ".sav"; - success = File::Copy(tmpStateFilename, stateFilename); + success = File::Copy(File::GetUserPath(D_STATESAVES_IDX) + "dtm.sav", stateFilename); } if (success) |