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

Commit ec9c339b authored by John Reck's avatar John Reck Committed by Gerrit Code Review
Browse files

Merge "Fix unintended buffer canceling"

parents 8521bfe7 70cc6ff8

libs/gui/Surface.cpp

+7 −3
Original line number Diff line number Diff line
@@ -792,11 +792,15 @@ int Surface::dequeueBuffers(std::vector<BatchBuffer>* buffers) { 
        return result;

    }



    std::vector<CancelBufferInput> cancelBufferInputs(numBufferRequested);

    std::vector<CancelBufferInput> cancelBufferInputs;

    cancelBufferInputs.reserve(numBufferRequested);

    std::vector<status_t> cancelBufferOutputs;

    for (size_t i = 0; i < numBufferRequested; i++) {

        cancelBufferInputs[i].slot = dequeueOutput[i].slot;

        cancelBufferInputs[i].fence = dequeueOutput[i].fence;

        if (dequeueOutput[i].result >= 0) {

            CancelBufferInput& input = cancelBufferInputs.emplace_back();

            input.slot = dequeueOutput[i].slot;

            input.fence = dequeueOutput[i].fence;

        }

    }



    for (const auto& output : dequeueOutput) {