[Libreoffice-commits] online.git: loleaflet/src

[Michael Meeks (via logerrit)]

 loleaflet/src/layer/tile/TileLayer.js |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 63c7055068ca920064804c6b90a14b8d337ad3b2
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Thu Dec 19 02:32:49 2019 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Dec 19 04:30:56 2019 +0100

    mobile: fix busy-idle loop consuming CPU.
    
    Loop is a constant re-layout:
    
    hide
    _onUserListRefresh
    onRefresh
    trigger
    refresh
    (anonymous)
    setTimeout (async)
    hide
    
    introduced by: e8b5f75ebe838fcebceddb9bf8590efb28cc8007
        mobile: Don't show the user list in the native app.
    
    Change-Id: I4a9efaf5e2779cf21b838b99ef4928b26e2f6358
    Reviewed-on: https://gerrit.libreoffice.org/85464
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index e189795e3..0a3d848b0 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1368,9 +1368,15 @@ L.TileLayer = L.GridLayer.extend({
 							!window.ThisIsAMobileApp &&
 							((window.mode.isMobile() && $.inArray('mobile', map['wopi'].HideUserList) < 0) ||
 							(window.mode.isTablet() && $.inArray('tablet', map['wopi'].HideUserList) < 0));
+
+		// Otherwise we can get an infinte, fast busy timeout loop.
+		if (toolbar.get('userlist').hidden == !showUserList)
+			return;
+
 		map.off('deselectuser', window.deselectUser);
 		map.off('addview', window.onAddView);
 		map.off('removeview', window.onRemoveView);
+
 		if (showUserList) {
 			toolbar.show('userlist');
 			toolbar.show('userlistbreak');