diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-21 12:31:36 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-06-21 15:40:50 (GMT) |
| commit | dbbc370400922cf9963a9a80ac0d1396450e8ef3 (patch) | |
| tree | 1b91e430fd83274a1e9bd90a59959a058556d026 /src/plugins | |
| parent | 220174b663a2b4db94fc82feba6939b0bef52aa2 (diff) | |
| download | Qt-dbbc370400922cf9963a9a80ac0d1396450e8ef3.zip Qt-dbbc370400922cf9963a9a80ac0d1396450e8ef3.tar.gz Qt-dbbc370400922cf9963a9a80ac0d1396450e8ef3.tar.bz2 | |
Copied VNC crash fixes from QWS
Copied from commit 71b840ef81a9 and commit 57fcc060f
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/vnc/qvncserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/vnc/qvncserver.cpp b/src/plugins/platforms/vnc/qvncserver.cpp index fb6eaa8..288d1bc 100644 --- a/src/plugins/platforms/vnc/qvncserver.cpp +++ b/src/plugins/platforms/vnc/qvncserver.cpp @@ -889,7 +889,7 @@ void QVNCServer::clientCutText() { QRfbClientCutText ev; - if (ev.read(client)) { + if (cutTextPending == 0 && ev.read(client)) { cutTextPending = ev.length; if (!cutTextPending) handleMsg = false; @@ -1317,7 +1317,7 @@ void QVNCServer::convertPixels(char *dst, const char *src, int count) const } if (count & 0x1) { const quint16 *src16 = reinterpret_cast<const quint16*>(src); - dst32[count - 1] = qt_conv16ToRgb(src16[count - 1]); + *dst32 = qt_conv16ToRgb(src16[count - 1]); } return; #endif |