summaryrefslogtreecommitdiffstats
path: root/src/client/util/platform/blankscreen_X11.cpp
diff options
context:
space:
mode:
authorChristian Klinger2016-09-12 12:02:10 +0200
committerChristian Klinger2016-09-12 12:02:10 +0200
commit16bf058f598b308d53fd2da095f7373adaec0a13 (patch)
tree88a098fa59e00ac23e62ac6df9daaebedc081756 /src/client/util/platform/blankscreen_X11.cpp
parentAdded support for a label field inside each room section + UTF8 (diff)
parentFix infinite loop when receiving incomplete headers (diff)
downloadpvs2-16bf058f598b308d53fd2da095f7373adaec0a13.tar.gz
pvs2-16bf058f598b308d53fd2da095f7373adaec0a13.tar.xz
pvs2-16bf058f598b308d53fd2da095f7373adaec0a13.zip
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/client/util/platform/blankscreen_X11.cpp')
-rwxr-xr-xsrc/client/util/platform/blankscreen_X11.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/util/platform/blankscreen_X11.cpp b/src/client/util/platform/blankscreen_X11.cpp
index cee8f03..db8873b 100755
--- a/src/client/util/platform/blankscreen_X11.cpp
+++ b/src/client/util/platform/blankscreen_X11.cpp
@@ -56,7 +56,7 @@ bool BlankScreen::lock(const QString& message)
QProcess ungrabP;
- ungrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/lock.sh");
+ ungrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/kb-lock.sh");
ungrabP.waitForFinished();
_locked = true;
@@ -77,9 +77,9 @@ bool BlankScreen::unlock()
XFlush(_sysdep->dpy);
- /* start the unlock.sh script */
+ /* start the kb-unlock.sh script */
QProcess regrabP;
- regrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/unlock.sh");
+ regrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/kb-unlock.sh");
regrabP.waitForFinished();
_locked = false;