[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - 2 commits - debian/changelog loleaflet/src loolwsd.spec.in

[Andras Timar (via logerrit)]

 debian/changelog             |    6 ++++++
 loleaflet/src/core/Socket.js |    4 +++-
 loolwsd.spec.in              |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 2fc243ee913e1e2269b7f24ffaae2e38d6766a85
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Sep 9 14:52:40 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 9 14:52:40 2020 +0200

    Bump package version to 4.2.4-12
    
    Change-Id: I926d4fe77015b8e3bb26f3b544427a4f99c7a514

diff --git a/debian/changelog b/debian/changelog
index 40a948c9e..3f35e1a70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.4-12) unstable; urgency=medium
+
+  * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-12
+
+ -- Andras Timar <andras.timar at collabora.com>  Wed, 09 Sep 2020 14:36:00 +0200
+
 loolwsd (4.2.4-11) unstable; urgency=medium
 
   * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-11
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index a53c2cad9..25e83acd0 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name:           loolwsd%{name_suffix}
 Name:           loolwsd
 %endif
 Version:        @PACKAGE_VERSION@
-Release:        11%{?dist}
+Release:        12%{?dist}
 Vendor:         %{vendor}
 Summary:        LibreOffice Online WebSocket Daemon
 License:        EULA
commit ce7c5eb6bf2fcdd426ec672a5eb3086c4478ddac
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jul 28 13:40:16 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Sep 9 14:50:56 2020 +0200

    Avoid usage of null variable
    
    Change-Id: I2e428baaef22094c40d316ea31a11bdf626af2d0
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99612
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 9f48d3145..3d36cfcb6 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -314,7 +314,9 @@ L.Socket = L.Class.extend({
 		}
 		else if (textMsg.startsWith('osinfo ')) {
 			var osInfo = textMsg.replace('osinfo ', '');
-			document.getElementById('os-info').innerText = osInfo;
+			var osInfoElement = document.getElementById('os-info');
+			if (osInfoElement)
+				osInfoElement.innerText = osInfo;
 		}
 		else if (textMsg.startsWith('clipboardkey: ')) {
 			var key = textMsg.substring('clipboardkey: '.length);