diff --git a/Utilities/StrUtil.h b/Utilities/StrUtil.h index b5df886164..d274cc074d 100644 --- a/Utilities/StrUtil.h +++ b/Utilities/StrUtil.h @@ -188,7 +188,7 @@ namespace fmt result.append(separator); } - return result.append(source.back()); + return result.append(*end); } template diff --git a/rpcs3/Emu/NP/np_handler.cpp b/rpcs3/Emu/NP/np_handler.cpp index 777301abbb..9dc02f983c 100644 --- a/rpcs3/Emu/NP/np_handler.cpp +++ b/rpcs3/Emu/NP/np_handler.cpp @@ -1085,6 +1085,11 @@ namespace np void np_handler::send_message(const message_data& msg_data, const std::set& npids) { + const std::string npids_string = fmt::format("\"%s\"", fmt::merge(npids, "\",\"")); + + rpcn_log.notice("Sending message to %s:", npids_string); + msg_data.print(); + get_rpcn()->send_message(msg_data, npids); } diff --git a/rpcs3/Emu/NP/rpcn_client.cpp b/rpcs3/Emu/NP/rpcn_client.cpp index a87fff8244..61ad839555 100644 --- a/rpcs3/Emu/NP/rpcn_client.cpp +++ b/rpcs3/Emu/NP/rpcn_client.cpp @@ -3122,6 +3122,7 @@ namespace rpcn if (sdata.is_error()) { + rpcn_log.error("Error parsing MessageReceived notification"); return; } @@ -3143,6 +3144,9 @@ namespace rpcn strcpy_trunc(mdata.commId.data, pb_mdata->communicationid()); mdata.data.assign(pb_mdata->data().begin(), pb_mdata->data().end()); + rpcn_log.notice("Received message from %s:", sender); + mdata.print(); + // Save the message and call callbacks { std::lock_guard lock(mutex_messages);