Merge branch 'Plasma/5.7'

This commit is contained in:
Martin Gräßlin 2016-07-14 13:52:41 +02:00
commit 57cc02096b

View file

@ -88,11 +88,20 @@ void FramebufferBackend::openFrameBuffer()
fd = open(deviceIdentifier().constData(), O_RDWR | O_CLOEXEC);
if (fd < 0) {
qCWarning(KWIN_FB) << "failed to open frame buffer device";
emit initFailed();
return;
}
m_fd = fd;
queryScreenInfo();
if (!queryScreenInfo()) {
qCWarning(KWIN_FB) << "failed to query framebuffer information";
emit initFailed();
return;
}
initImageFormat();
if (m_imageFormat == QImage::Format_Invalid) {
emit initFailed();
return;
}
setReady(true);
emit screensQueried();
}