summaryrefslogtreecommitdiffstats
path: root/kit
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2021-02-19 13:31:30 +0200
committerTor Lillqvist <tml@iki.fi>2021-02-19 14:29:40 +0200
commit9492ef6142c85c9e0eff69eacc239f2db6361722 (patch)
tree28698f3fface65a9b1abf17c20218883c9577ad1 /kit
parentcypress: document interference testing in README. (diff)
downloadonline-9492ef6142c85c9e0eff69eacc239f2db6361722.tar.gz
online-9492ef6142c85c9e0eff69eacc239f2db6361722.zip
Include the view id in the tunnelled dialog image hash
Otherwise this will break badly in the collaborative editing (multiple views) case. Change-Id: I63d391cb5a7d118c34564c4e1a4df7710b13e90e Signed-off-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'kit')
-rw-r--r--kit/ChildSession.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 506074fd06..e52887a26a 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1665,7 +1665,7 @@ bool ChildSession::renderWindow(const char* /*buffer*/, int /*length*/, const St
<< " and rendered in " << elapsedMs << " (" << area / elapsedMics
<< " MP/s).");
- uint64_t pixmapHash = Png::hashSubBuffer(pixmap.data(), 0, 0, width, height, bufferWidth, bufferHeight);
+ uint64_t pixmapHash = Png::hashSubBuffer(pixmap.data(), 0, 0, width, height, bufferWidth, bufferHeight) + getViewId();
auto found = std::find(_pixmapCache.begin(), _pixmapCache.end(), pixmapHash);