From 0a898f66b4c3cf63e32bc90d73dae33fee41a29a Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 3 Jun 2017 17:25:22 -0700 Subject: [PATCH 1/2] Util: Fix CircleBufferWrite --- src/util/circle-buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/circle-buffer.c b/src/util/circle-buffer.c index c60326e3c..c77a71eba 100644 --- a/src/util/circle-buffer.c +++ b/src/util/circle-buffer.c @@ -127,7 +127,7 @@ int CircleBufferWrite16(struct CircleBuffer* buffer, int16_t value) { size_t CircleBufferWrite(struct CircleBuffer* buffer, const void* input, size_t length) { int8_t* data = buffer->writePtr; - if (buffer->size + sizeof(int16_t) > buffer->capacity) { + if (buffer->size + length > buffer->capacity) { return 0; } size_t remaining = buffer->capacity - ((int8_t*) data - (int8_t*) buffer->data); From 89a4b427a1bd6703c1f5791778ff67e9c6e63127 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sat, 3 Jun 2017 17:46:25 -0700 Subject: [PATCH 2/2] Qt: Fix library view redrawing way too much --- src/platform/qt/library/LibraryTree.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/platform/qt/library/LibraryTree.cpp b/src/platform/qt/library/LibraryTree.cpp index 45b972d77..6dc763e4a 100644 --- a/src/platform/qt/library/LibraryTree.cpp +++ b/src/platform/qt/library/LibraryTree.cpp @@ -147,15 +147,12 @@ void LibraryTree::rebuildTree() { LibraryEntryRef currentGame = selectedEntry(); int count = m_widget->topLevelItemCount(); - for (int a = 0; a < count; a++) { - m_widget->takeTopLevelItem(0); + for (int a = count - 1; a >= 0; --a) { + m_widget->takeTopLevelItem(a); } for (QTreeWidgetItem* i : m_pathNodes.values()) { - count = i->childCount(); - for (int a = 0; a < count; a++) { - i->takeChild(0); - } + i->takeChildren(); } if (m_currentStyle == LibraryStyle::STYLE_TREE) {