In rfbSendFileTransferChunk() check permitFileTransfer 1st to avoid false alarms.

pull/1/head
runge 17 years ago
parent a270771286
commit a549c3aaff

@ -1310,10 +1310,11 @@ rfbBool rfbSendFileTransferChunk(rfbClientPtr cl)
/* /*
* Don't close the client if we get into this one because * Don't close the client if we get into this one because
* it is called from many places to service file transfers. * it is called from many places to service file transfers.
* Note that permitFileTransfer is checked first.
*/ */
if ((cl->screen->getFileTransferPermission != NULL if (cl->screen->permitFileTransfer != TRUE ||
&& cl->screen->getFileTransferPermission(cl) != TRUE) (cl->screen->getFileTransferPermission != NULL
|| cl->screen->permitFileTransfer != TRUE) { && cl->screen->getFileTransferPermission(cl) != TRUE)) {
return TRUE; return TRUE;
} }

Loading…
Cancel
Save