safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'unstable' of ssh://guacamole.git.sourceforge.net/gitroot/guacamole/guacamole-common-js into unstable

Browse Source
This commit is contained in:
Michael Jumper
2011-02-17 02:11:59 -08:00
parent 299eb56d79 25fd42afea
commit fb623a1933
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole-common-js/src/main/resources/layer.js
View File

@@ -151,13 +151,21 @@ function Layer(width, height) {
display.copyRect = function(srcLayer, srcx, srcy, w, h, x, y) { display.copyRect = function(srcLayer, srcx, srcy, w, h, x, y) {
var updateId = currentUpdate++; var updateId = currentUpdate++;
// Synchronize copy operation with source layer function scheduleCopyRect() {
srcLayer.sync(function() {
setUpdate(updateId, function() { setUpdate(updateId, function() {
if (autosize != 0) fitRect(x, y, w, h); if (autosize != 0) fitRect(x, y, w, h);
displayContext.drawImage(srcLayer, srcx, srcy, w, h, x, y, w, h); displayContext.drawImage(srcLayer, srcx, srcy, w, h, x, y, w, h);
}); });
}); }
// If we ARE the source layer, no need to sync.
// Syncing would result in deadlock.
if (display === srcLayer)
scheduleCopyRect();
// Otherwise synchronize copy operation with source layer
else
srcLayer.sync(scheduleCopyRect);
}; };