summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2015-04-17 12:31:13 +0200
committerChristian Beier <dontmind@freeshell.org>2015-04-17 12:31:13 +0200
commit7c7e8e765c06a8af13c1f2662f1c7084c937738a (patch)
treeacc64cdd41616efd5958005acce5d2dca435e407
parente543e1ac1b11a0ef0b1bdd25b06a27b3ac2156c2 (diff)
downloadlibtdevnc-7c7e8e76.tar.gz
libtdevnc-7c7e8e76.zip
Re-add the useful bits of 9aa9ac59b4cb10bfca93456a3098e348de172d7f.
-rw-r--r--libvncclient/rfbproto.c4
-rw-r--r--libvncclient/vncviewer.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
index 721c3ae..e2a583c 100644
--- a/libvncclient/rfbproto.c
+++ b/libvncclient/rfbproto.c
@@ -167,6 +167,10 @@ static void FillRectangle(rfbClient* client, int x, int y, int w, int h, uint32_
static void CopyRectangle(rfbClient* client, uint8_t* buffer, int x, int y, int w, int h) {
int j;
+ if (client->frameBuffer == NULL) {
+ return;
+ }
+
#define COPY_RECT(BPP) \
{ \
int rs = w * BPP / 8, rs2 = client->width * BPP / 8; \
diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c
index 4f87f01..af0a50b 100644
--- a/libvncclient/vncviewer.c
+++ b/libvncclient/vncviewer.c
@@ -154,6 +154,9 @@ rfbClient* rfbGetClient(int bitsPerSample,int samplesPerPixel,
/* default: use complete frame buffer */
client->updateRect.x = -1;
+ client->frameBuffer = NULL;
+ client->outputWindow = 0;
+
client->format.bitsPerPixel = bytesPerPixel*8;
client->format.depth = bitsPerSample*samplesPerPixel;
client->appData.requestedDepth=client->format.depth;