New upstream version 24.0.3+dfsg1

This commit is contained in:
Sebastian Ramacher 2019-10-13 21:58:08 +02:00
parent 5a730d6ec3
commit 52fa83f147
16 changed files with 213 additions and 32 deletions

View file

@ -650,13 +650,15 @@ void OBSBasicPreview::mouseReleaseEvent(QMouseEvent *event)
std::lock_guard<std::mutex> lock(selectMutex);
if (altDown || ctrlDown || shiftDown) {
for (int i = 0; i < selectedItems.size(); i++) {
for (size_t i = 0; i < selectedItems.size();
i++) {
obs_sceneitem_select(selectedItems[i],
true);
}
}
for (int i = 0; i < hoveredPreviewItems.size(); i++) {
for (size_t i = 0; i < hoveredPreviewItems.size();
i++) {
bool select = true;
obs_sceneitem_t *item = hoveredPreviewItems[i];
@ -1677,7 +1679,7 @@ bool OBSBasicPreview::DrawSelectedItem(obs_scene_t *scene,
bool hovered = false;
{
std::lock_guard<std::mutex> lock(prev->selectMutex);
for (int i = 0; i < prev->hoveredPreviewItems.size(); i++) {
for (size_t i = 0; i < prev->hoveredPreviewItems.size(); i++) {
if (prev->hoveredPreviewItems[i] == item) {
hovered = true;
break;