diff options
| author |  Lioncash | 2020-04-17 19:22:43 -0400 |
|---|---|---|
| committer | Lioncash | 2020-04-17 19:22:46 -0400 |
| commit | 64f226889c56c516bea7fbd02c38c1fd8249d255 (patch) | |
| tree | ff992d2a8c5946c63d23392379e59f3d9f249efa /src | |
| parent | Merge pull request #3666 from bunnei/new-vmm (diff) | |
| download | yuzu-64f226889c56c516bea7fbd02c38c1fd8249d255.tar.gz yuzu-64f226889c56c516bea7fbd02c38c1fd8249d255.tar.xz yuzu-64f226889c56c516bea7fbd02c38c1fd8249d255.zip | |
am: Resolve ineffective moves
Previously const objects were being std::moved, which results in no move
actually occurring. This resolves that.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 557608e76..3ece2cf3c 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp | |||
| @@ -903,7 +903,7 @@ private: | |||
| 903 | void PopOutData(Kernel::HLERequestContext& ctx) { | 903 | void PopOutData(Kernel::HLERequestContext& ctx) { |
| 904 | LOG_DEBUG(Service_AM, "called"); | 904 | LOG_DEBUG(Service_AM, "called"); |
| 905 | 905 | ||
| 906 | const auto storage = applet->GetBroker().PopNormalDataToGame(); | 906 | auto storage = applet->GetBroker().PopNormalDataToGame(); |
| 907 | if (storage == nullptr) { | 907 | if (storage == nullptr) { |
| 908 | LOG_ERROR(Service_AM, | 908 | LOG_ERROR(Service_AM, |
| 909 | "storage is a nullptr. There is no data in the current normal channel"); | 909 | "storage is a nullptr. There is no data in the current normal channel"); |
| @@ -934,7 +934,7 @@ private: | |||
| 934 | void PopInteractiveOutData(Kernel::HLERequestContext& ctx) { | 934 | void PopInteractiveOutData(Kernel::HLERequestContext& ctx) { |
| 935 | LOG_DEBUG(Service_AM, "called"); | 935 | LOG_DEBUG(Service_AM, "called"); |
| 936 | 936 | ||
| 937 | const auto storage = applet->GetBroker().PopInteractiveDataToGame(); | 937 | auto storage = applet->GetBroker().PopInteractiveDataToGame(); |
| 938 | if (storage == nullptr) { | 938 | if (storage == nullptr) { |
| 939 | LOG_ERROR(Service_AM, | 939 | LOG_ERROR(Service_AM, |
| 940 | "storage is a nullptr. There is no data in the current interactive channel"); | 940 | "storage is a nullptr. There is no data in the current interactive channel"); |