diff --git a/resources/qml/InviteDialog.qml b/resources/qml/InviteDialog.qml index b1b1bb39af84bd4c4b24fe484bb3c40f4bb52e1d..1eaaef8fc1a7c0cd3635c825e731e7eeeb80da08 100644 --- a/resources/qml/InviteDialog.qml +++ b/resources/qml/InviteDialog.qml @@ -72,9 +72,9 @@ ApplicationWindow { Component.onCompleted: forceActiveFocus() Keys.onShortcutOverride: event.accepted = ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers & Qt.ControlModifier)) Keys.onPressed: { - if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers === Qt.ControlModifier)) { + if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers === Qt.ControlModifier)) cleanUpAndClose(); - } + } } diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml index 0a0f90cf071c24e1d0e781ce785539cc730f8d58..b53952323d338badf63a17cdbfb63225a954bbd4 100644 --- a/resources/qml/Root.qml +++ b/resources/qml/Root.qml @@ -141,14 +141,12 @@ Page { }); membersDialog.show(); } - onOpenRoomSettingsDialog: { var roomSettings = roomSettingsComponent.createObject(timelineRoot, { "roomSettings": settings }); roomSettings.show(); } - onOpenInviteUsersDialog: { var dialog = inviteDialog.createObject(timelineRoot, { "roomId": Rooms.currentRoom.roomId,