[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork/krfb/krfb
From: George Kiagiadakis <kiagiadakis.george () gmail ! com>
Date: 2011-05-03 12:36:53
Message-ID: 20110503123653.292CDAC85F () svn ! kde ! org
[Download RAW message or body]
SVN commit 1230289 by gkiagia:
Do not crash if the framebuffer plugin cannot be loaded.
BUG: 272290
M +3 -0 rfbserver.cpp
M +3 -1 rfbservermanager.cpp
--- trunk/KDE/kdenetwork/krfb/krfb/rfbserver.cpp #1230288:1230289
@@ -88,6 +88,9 @@
{
if (!d->screen) {
d->screen = RfbServerManager::instance()->newScreen();
+ if (!d->screen) {
+ return false;
+ }
// server hooks
d->screen->screenData = this;
--- trunk/KDE/kdenetwork/krfb/krfb/rfbservermanager.cpp #1230288:1230289
@@ -175,8 +175,9 @@
rfbScreenInfoPtr RfbServerManager::newScreen()
{
- rfbScreenInfoPtr screen;
+ rfbScreenInfoPtr screen = NULL;
+ if (!d->fb.isNull()) {
int w = d->fb->width();
int h = d->fb->height();
int depth = d->fb->depth();
@@ -197,6 +198,7 @@
screen->desktopName = d->desktopName.constData();
screen->cursor = d->myCursor;
+ }
return screen;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic