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

Commit a455793a authored by Marco Nelissen's avatar Marco Nelissen
Browse files

fbDev wasn't initialized of hw_get_module failed, but was then used anyway.

parent 96a1b054

libs/ui/FramebufferNativeWindow.cpp

+10 −8
Original line number Original line Diff line number Diff line
@@ -117,7 +117,6 @@ FramebufferNativeWindow::FramebufferNativeWindow() 




        LOGE_IF(err, "fb buffer 1 allocation failed w=%d, h=%d, err=%s",

        LOGE_IF(err, "fb buffer 1 allocation failed w=%d, h=%d, err=%s",

                fbDev->width, fbDev->height, strerror(-err));

                fbDev->width, fbDev->height, strerror(-err));

    }





        const_cast<uint32_t&>(android_native_window_t::flags) = fbDev->flags; 

        const_cast<uint32_t&>(android_native_window_t::flags) = fbDev->flags; 

        const_cast<float&>(android_native_window_t::xdpi) = fbDev->xdpi;

        const_cast<float&>(android_native_window_t::xdpi) = fbDev->xdpi;
@@ -126,6 +125,9 @@ FramebufferNativeWindow::FramebufferNativeWindow() 
            fbDev->minSwapInterval;

            fbDev->minSwapInterval;

        const_cast<int&>(android_native_window_t::maxSwapInterval) = 

        const_cast<int&>(android_native_window_t::maxSwapInterval) = 

            fbDev->maxSwapInterval;

            fbDev->maxSwapInterval;

    } else {

        LOGE("Couldn't get gralloc module");

    }





    android_native_window_t::setSwapInterval = setSwapInterval;

    android_native_window_t::setSwapInterval = setSwapInterval;

    android_native_window_t::dequeueBuffer = dequeueBuffer;

    android_native_window_t::dequeueBuffer = dequeueBuffer;