From d8a695b9c6609061d4c2a0623370b56a0e1749e7 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 28 Jul 2014 10:22:53 +0000 Subject: [PATCH] if zlib is disabled (which it can now be), don't use it even if level is high! git-svn-id: https://xpra.org/svn/Xpra/trunk@6984 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/server/picture_encode.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xpra/server/picture_encode.py b/src/xpra/server/picture_encode.py index 9c3e53f070..f3d87a6a25 100644 --- a/src/xpra/server/picture_encode.py +++ b/src/xpra/server/picture_encode.py @@ -120,7 +120,7 @@ def rgb_encode(coding, image, rgb_formats, supports_transparency, speed, rgb_zli #fewer pixels, make it more likely we won't bother compressing: level = level / 2 if level>0: - lz4 = compression.use_lz4 and rgb_lz4 and level<=3 + lz4 = (not rgb_zlib) or (compression.use_lz4 and rgb_lz4 and level<=3) wire_data = compression.compressed_wrapper(coding, pixels, level=level, lz4=lz4) raw_data = wire_data.data #log("%s/%s data compressed from %s bytes down to %s (%s%%) with lz4=%s",