summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-02-11 17:40:48 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-02-11 17:40:48 +0100
commitd3834ad4f50062ba720bc38e9248bd3c1335b50d (patch)
tree2dd017fcdac324b6f0ae7420146b96f4aeee5b64
parentdc4a0dd776c07aaaec23489f4500b53ebe9bf581 (diff)
downloadtdebase-d3834ad4f50062ba720bc38e9248bd3c1335b50d.zip
tdebase-d3834ad4f50062ba720bc38e9248bd3c1335b50d.tar.gz
Add $DISPLAY to kdesktop_lock_lockfile file name.
This resolves bug 2998. Thanks to Russell Brown for analyzing the problem and propose a solution. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--kdesktop/lock/main.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 871c87a..f273234 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -332,7 +332,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) {