Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41903119 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BufferQueueProducer: Slot may have null buffer" into rvc-dev am:... 

Merge "BufferQueueProducer: Slot may have null buffer" into rvc-dev am: 256a877a am: 3b2d8e86 am: ee569c75

Change-Id: If12ef00e9d79a2023bab9063dffdbb4d8178ad40
parents 03a88106 ee569c75

libs/gui/BufferQueueProducer.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -655,8 +655,9 @@ status_t BufferQueueProducer::detachBuffer(int slot) { 
        }

        }





        listener = mCore->mConsumerListener;

        listener = mCore->mConsumerListener;

        if (listener != nullptr) {

        auto gb = mSlots[slot].mGraphicBuffer;

            listener->onFrameDetached(mSlots[slot].mGraphicBuffer->getId());

        if (listener != nullptr && gb != nullptr) {

            listener->onFrameDetached(gb->getId());

        }

        }

        mSlots[slot].mBufferState.detachProducer();

        mSlots[slot].mBufferState.detachProducer();

        mCore->mActiveBuffers.erase(slot);

        mCore->mActiveBuffers.erase(slot);