summaryrefslogtreecommitdiff
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2016-07-25 13:45:40 +0200
committerAndrea Azzarone <azzaronea@gmail.com>2016-07-25 13:45:40 +0200
commit1e31d287dcd3dfbdd7d45fdcc24e1cf9b01e8d9c (patch)
treeb37ee534d136d9b633459f851c01c8571f71cc88
parent9c8ede152b96c6a7037f89d52d365aa0147677b8 (diff)
Invert order of the boolean operation.
(bzr r4153.5.2)
-rw-r--r--plugins/unityshell/src/unityshell.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 67a7e7018..9f0a57ef7 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -3189,7 +3189,7 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
bool UnityWindow::damageRect(bool initial, CompRect const& rect)
{
- if (!CanBypassLockScreen() && uScreen->lockscreen_controller_->IsLocked())
+ if (uScreen->lockscreen_controller_->IsLocked() && !CanBypassLockScreen())
return true;
if (initial)