diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-02-11 17:40:48 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-02-11 17:43:38 +0100 |
| commit | 5f7a92ca0add50783e703850770d20e0ae1dcb52 (patch) | |
| tree | 109fc54d4e6d8f5879b3b4c5b8f957c9422fb49b /kdesktop | |
| parent | 4e78f809c5a286394988403a3d7f88027f249280 (diff) | |
| download | tdebase-5f7a92ca0add50783e703850770d20e0ae1dcb52.tar.gz tdebase-5f7a92ca0add50783e703850770d20e0ae1dcb52.zip | |
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>
(cherry picked from commit d3834ad4f50062ba720bc38e9248bd3c1335b50d)
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/lock/main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |