# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sanya0996@gmail.com-20160728193612-cm1qia7bsxc5mknl
# target_branch: lp:unity
# testament_sha1: a9abce1222270163ab6289fd385a1df952e0f222
# timestamp: 2016-07-28 22:37:20 +0300
# base_revision_id: ci-train-bot@canonical.com-20160715151328-\
#   1huydkk2eofotjy2
# 
# Begin patch
=== modified file 'lockscreen/LockScreenAcceleratorController.cpp'
--- lockscreen/LockScreenAcceleratorController.cpp	2016-07-05 10:22:08 +0000
+++ lockscreen/LockScreenAcceleratorController.cpp	2016-07-28 19:36:12 +0000
@@ -193,11 +193,10 @@
 
   CompOption::Vector options;
 
-  if (action.state() & CompAction::StateInitKey)
-    action.initiate()(&action, 0, options);
-
   if (action.state() & CompAction::StateTermKey)
     action.terminate()(&action, CompAction::StateTermTapped, options);
+  else if (action.state() & CompAction::StateInitKey)
+    action.initiate()(&action, 0, options);
 }
 
 Accelerators::Ptr const& AcceleratorController::GetAccelerators() const

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVbmMKYAAYpfgEAQUWf//3os
CAC////wUAOHu7bI40O5DhKIUxNNomRp6TQ0p6Y00pp6eo1PUeoGgkpBkDTQm1Ro9QD1AMmgAeoB
JECaanpAm0KaZNDRkyMjI0GIYAAAAAAAAAABJSeplG00jU9NTxTQzUyaBoAAAyfXBe+f3NLH6GFj
YPIlEhMyRoyN6MJPWXP1sVVSvviecka7lHUscrJ1Wyj27/5nvno8sQrf+VntsvRioT/TXONKOF58
4U7j7gp8T5EMwZxYzcth8ZtQVZbUjCgsabJonRRjFjDRePPFCeewl8OIjyqYYc3klVQFi3Xa6HHn
JskjfiPhLNUTT3ibB5bcypslaYNXinyc1bVivmgRur7bjSwrwylhGrQW8sLsEwqB9AoM9CvfXAlK
lE6iaRQuOG8l7F8lHcbMb02EJ8TIdNS1MoRNyXDwZZTj5tTlbcaEEXjI1tlFeST34S1DDtpG0Csh
Ma1KYargdGy0sE21kXCICc4zweURfKnJRp0rxC5PkgK0o9GBuG7KXutcDSKuN1ElWJFKDKBiOT6S
FMgxnW1tpgb7Gb0F0cpOBZ6AYR0ZvklqyOFGke81a86rPhSGkNNnambknTTkzyKhGjaurtM/njzm
ozrdjyjCpEivkMyinibm4kzb4NdKoccHF6Ja1OC6DYuAnC7D5i3UEPb47aOGmwNyIocwpzQdFkBU
Sl6EhFIrI06S6dRlgVhrYItyFPyJFyoDwDT8P6HbGCfXXLAKpNwYC3JE7MtGDlDVZjPngYl0HGsv
VKZjOtpsjeUbzokerGrgMxmfeWtbhyuzysYyWUOuWq0YvWZarwgSzQWoo8NHp2YGU7oqPSXborak
LbbDKgyNP25u2ike483ValOe9FvtJkMMESc0hHt3o9MgbKzwJBlIMXj/UV3ppuKkTWmQc0OXwFHr
jsrdl1KKqi8QpN67cnpEmFSdg64LVETKIWBrSmyCvJBJgensyhn15/P1adJCOy4n4Je1WzyNfaKk
mkSezg4Mw7McsohF3cNv+hr3imGgpVE3dOopc3E+x58irgm2gvPEDfpCZnllKJLfMvQK51PeQuc5
TD56rfGD+bpFWcl9oQRWFbKQPRVTrrIbIrtKRsr3hVvhtp2m0dNuxUdU5sdm1A6lbsh0wReK7gdY
EWsLDzgM6VxW1FGMjiC96gpBUtAOMrlQdho4P7ZmjiropwRdOKPQysYw/k5LNb20wrKP8XckU4UJ
BW5jCmA=