Fix #203 (#204)

Eeems-Org · Jul 11, 2021 · 98790e6 · 98790e6
1 parent 66fee40
commit 98790e6
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/applications/system-service/dbusservice.h b/applications/system-service/dbusservice.h
@@ -115,7 +115,15 @@ class DBusService : public APIBase {
         connect(buttonHandler, &ButtonHandler::activity, systemAPI, &SystemAPI::activity);
         connect(powerAPI, &PowerAPI::chargerStateChanged, systemAPI, &SystemAPI::activity);
         connect(systemAPI, &SystemAPI::leftAction, appsAPI, []{
-            if(!notificationAPI->locked() && !appsAPI->previousApplicationNoSecurityCheck()){
+            if(notificationAPI->locked()){
+                return;
+            }
+            auto currentApplication = appsAPI->getApplication(appsAPI->currentApplicationNoSecurityCheck());
+            if(currentApplication != nullptr && currentApplication->path() == appsAPI->lockscreenApplication().path()){
+                qDebug() << "Left Action cancelled. On lockscreen";
+                return;
+            }
+            if(!appsAPI->previousApplicationNoSecurityCheck()){
                 appsAPI->openDefaultApplication();
             }
         });