godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77093 from RandomShaper/fix_mq_copy 

Fix transfer of messages between queues
This commit is contained in:
Rémi Verschelde 2023-05-15 13:47:18 +02:00
parent 5adac3c680 93de52942a
commit 5c653c27cd
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/object/message_queue.cpp
View File

@ -236,7 +236,7 @@ Error CallQueue::flush() {
uint32_t dst_page = mq->pages_used - 1;
uint32_t dst_offset = mq->page_bytes[dst_page];
if (dst_offset + page_bytes[0] < uint32_t(PAGE_SIZE_BYTES)) {
memcpy(mq->pages[dst_page] + dst_offset, pages[0], page_bytes[0]);
memcpy(mq->pages[dst_page]->data + dst_offset, pages[0]->data, page_bytes[0]);
src_page++;
}
}
@ -253,7 +253,7 @@ Error CallQueue::flush() {
for (; src_page < pages_used; src_page++) {
mq->_add_page();
memcpy(mq->pages[mq->pages_used - 1], pages[src_page], page_bytes[src_page]);
memcpy(mq->pages[mq->pages_used - 1]->data, pages[src_page]->data, page_bytes[src_page]);
mq->page_bytes[mq->pages_used - 1] = page_bytes[src_page];
}