From 5f7a92ca0add50783e703850770d20e0ae1dcb52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 11 Feb 2019 17:40:48 +0100
Subject: Add $DISPLAY to kdesktop_lock_lockfile file name. This resolves bug
 2998.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to Russell Brown for analyzing the problem and propose a solution.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d3834ad4f50062ba720bc38e9248bd3c1335b50d)
---
 kdesktop/lock/main.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index c1b1da2f0..a79f6924f 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -325,7 +325,7 @@ int main( int argc, char **argv )
 #endif
         }
 
-        TDELockFile lock(locateLocal("tmp", "kdesktop_lock_lockfile"));
+        TDELockFile lock(locateLocal("tmp", TQString("kdesktop_lock_lockfile.%1").arg(getenv("DISPLAY"))));
         lock.setStaleTime(0);
         TDELockFile::LockResult lockRet = lock.lock();
         if (lockRet != TDELockFile::LockOK) {
-- 
cgit v1.2.3