From 9492ef6142c85c9e0eff69eacc239f2db6361722 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 19 Feb 2021 13:31:30 +0200 Subject: 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 --- kit/ChildSession.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kit') 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); -- cgit