summaryrefslogtreecommitdiffstats
path: root/redhat/kdebase/kdebase-3.5.12-kdesktop_lock_fix.patch
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-05 13:28:24 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-05 13:28:24 -0600
commitcd20bd0bb55ec383cf4cdeaad16eb23512e91206 (patch)
tree6c755a18c8bd51e26eadd07632bf92fbefc5f848 /redhat/kdebase/kdebase-3.5.12-kdesktop_lock_fix.patch
parent629156d239e0489a18a167ab770be3ae6087a647 (diff)
parentc99e2aca485d146337b087cdb0876e82fe5030d8 (diff)
downloadtde-packaging-cd20bd0bb55ec383cf4cdeaad16eb23512e91206.tar.gz
tde-packaging-cd20bd0bb55ec383cf4cdeaad16eb23512e91206.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/kdebase/kdebase-3.5.12-kdesktop_lock_fix.patch')
-rw-r--r--redhat/kdebase/kdebase-3.5.12-kdesktop_lock_fix.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/redhat/kdebase/kdebase-3.5.12-kdesktop_lock_fix.patch b/redhat/kdebase/kdebase-3.5.12-kdesktop_lock_fix.patch
new file mode 100644
index 000000000..0acc11659
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.12-kdesktop_lock_fix.patch
@@ -0,0 +1,22 @@
+--- kdebase-3.5.12/kdesktop/lock/lockprocess.cc.ORI 2011-12-21 18:40:05.553301746 +0100
++++ kdebase-3.5.12/kdesktop/lock/lockprocess.cc 2011-12-21 18:43:01.643590270 +0100
+@@ -1045,17 +1045,13 @@
+ mHackProc << word;
+ }
+
+- if (!mForbidden)
++ if (!mForbidden && mHackProc.start() == true)
+ {
+-
+- if (mHackProc.start() == true)
+- {
+ #ifdef HAVE_SETPRIORITY
+ setpriority(PRIO_PROCESS, mHackProc.pid(), mPriority);
+ #endif
+ //bitBlt(this, 0, 0, &mOriginal);
+ return true;
+- }
+ }
+ else
+ // we aren't allowed to start the specified screensaver either because it didn't run for some reason
+