CyberGroup
/
yuzu
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed spelling errors and fixed issue with Pop not returning the SizedNotificationInfo

This commit is contained in:
David Marcec 2019-06-25 11:23:23 +10:00
parent e49ae3bf92
commit 5d005b87a3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/hle/service/friend/friend.cpp
View File

@ -151,7 +151,7 @@ private:
while (!notifications.empty()) { while (!notifications.empty()) {
notifications.pop(); notifications.pop();
} }
states.has_recieved_friend_request = false; states.has_received_friend_request = false;
states.has_updated_friends = false; states.has_updated_friends = false;
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
@ -160,13 +160,14 @@ private:
void Pop(Kernel::HLERequestContext& ctx) { void Pop(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_ACC, "called"); LOG_DEBUG(Service_ACC, "called");
IPC::ResponseBuilder rb{ctx, 2};
if (notifications.empty()) { if (notifications.empty()) {
LOG_ERROR(Service_ACC, "No notifications in queue!"); LOG_ERROR(Service_ACC, "No notifications in queue!");
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ERR_NO_NOTIFICATIONS); rb.Push(ERR_NO_NOTIFICATIONS);
return; return;
} }
IPC::ResponseBuilder rb{ctx, 6};
auto notification = notifications.front(); auto notification = notifications.front();
notifications.pop(); notifications.pop();
@ -175,8 +176,8 @@ private:
case NotificationTypes::HasUpdatedFriendsList: case NotificationTypes::HasUpdatedFriendsList:
states.has_updated_friends = false; states.has_updated_friends = false;
break; break;
case NotificationTypes::HasRecievedFriendRequest: case NotificationTypes::HasReceivedFriendRequest:
states.has_recieved_friend_request = false; states.has_received_friend_request = false;
break; break;
default: default:
// HOS seems not have an error case for an unknown notification // HOS seems not have an error case for an unknown notification
@ -185,11 +186,12 @@ private:
break; break;
} }
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushRaw<SizedNotificationInfo>(notification);
} }
enum class NotificationTypes : u32_le { enum class NotificationTypes : u32_le {
HasUpdatedFriendsList = 0x65, HasUpdatedFriendsList = 0x65,
HasRecievedFriendRequest = 0x1 HasReceivedFriendRequest = 0x1
}; };
struct SizedNotificationInfo { struct SizedNotificationInfo {
@ -201,7 +203,7 @@ private:
struct States { struct States {
bool has_updated_friends; bool has_updated_friends;
bool has_recieved_friend_request; bool has_received_friend_request;
}; };
Common::UUID uuid{}; Common::UUID uuid{};