From 47af78334fd6d38be062be1a4892b5564da39109 Mon Sep 17 00:00:00 2001
From: Lubos <lubos@iiteam.eu>
Date: Thu, 21 Sep 2023 16:17:23 +0200
Subject: [PATCH] Fixed app freezing when feature edit was canceled

---
 app/qml/editor/inputtextedit.qml | 4 ++--
 app/qml/form/FeatureForm.qml     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/qml/editor/inputtextedit.qml b/app/qml/editor/inputtextedit.qml
index 9b6d14ed1..631f93d43 100644
--- a/app/qml/editor/inputtextedit.qml
+++ b/app/qml/editor/inputtextedit.qml
@@ -69,8 +69,8 @@ AbstractEditor {
       }
 
       editorValueChanged( val, val === "" )
-    }
 
-    onPreeditTextChanged: if ( __androidUtils.isAndroid ) Qt.inputMethod.commit() // to avoid Android's uncommited text
+      if ( __androidUtils.isAndroid ) Qt.inputMethod.commit() // to avoid Android's uncommited text
+    }
   }
 }
diff --git a/app/qml/form/FeatureForm.qml b/app/qml/form/FeatureForm.qml
index b678bca2f..5aed887ca 100644
--- a/app/qml/form/FeatureForm.qml
+++ b/app/qml/form/FeatureForm.qml
@@ -150,6 +150,8 @@ Item {
       form.controller.deleteFeature()
     }
 
+    parent.focus = true
+
     // rollback all changes if the layer is still editable
     form.controller.rollback()