From 46b4e578c057922f60c16243a6959f1ae147da64 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Tue, 9 Jun 2020 14:25:45 -0700
Subject: [PATCH] Fix location of Qt.inputMethod.hide()

---
 src/QmlControls/QGCViewDialog.qml          | 2 --
 src/QmlControls/QGCViewDialogContainer.qml | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/QmlControls/QGCViewDialog.qml b/src/QmlControls/QGCViewDialog.qml
index 34dba11fa0..968afb91ce 100644
--- a/src/QmlControls/QGCViewDialog.qml
+++ b/src/QmlControls/QGCViewDialog.qml
@@ -32,14 +32,12 @@ Item {
 
     function accept() {
         if (acceptAllowed) {
-            Qt.inputMethod.hide()
             hideDialog()
         }
     }
 
     function reject() {
         if (rejectAllowed) {
-            Qt.inputMethod.hide()
             hideDialog()
         }
     }
diff --git a/src/QmlControls/QGCViewDialogContainer.qml b/src/QmlControls/QGCViewDialogContainer.qml
index 7eb43ae205..bad30fcc0b 100644
--- a/src/QmlControls/QGCViewDialogContainer.qml
+++ b/src/QmlControls/QGCViewDialogContainer.qml
@@ -86,6 +86,7 @@ Item {
     Connections {
         target: _dialogComponentLoader.item
         onHideDialog: {
+            Qt.inputMethod.hide()
             mainWindowDialog.close()
         }
     }
-- 
GitLab