summary refs log tree commit diff
path: root/resources/qml/dialogs/RoomSettings.qml
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2021-11-07 12:42:40 +0100
committerGitHub <noreply@github.com>2021-11-07 12:42:40 +0100
commit1bdf4ebd2102eafb2afcf50a0a18ec43d896056c (patch)
treee21a55f41b76b6048e0cc88dd689dd41c4de8a63 /resources/qml/dialogs/RoomSettings.qml
parentMerge pull request #790 from LorenDB/fixRRDialog (diff)
parentMove away from using an event loop to access secrets (diff)
downloadnheko-1bdf4ebd2102eafb2afcf50a0a18ec43d896056c.tar.xz
Merge pull request #791 from Nheko-Reborn/secret-storage-fixes
Move away from using an event loop to access secrets
Diffstat (limited to 'resources/qml/dialogs/RoomSettings.qml')
-rw-r--r--resources/qml/dialogs/RoomSettings.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml

index 0e7749ce..b0f7730b 100644 --- a/resources/qml/dialogs/RoomSettings.qml +++ b/resources/qml/dialogs/RoomSettings.qml
@@ -239,7 +239,7 @@ ApplicationWindow { onRejected: { encryptionToggle.checked = false; } - buttons: Dialog.Ok | Dialog.Cancel + buttons: Platform.MessageDialog.Ok | Platform.MessageDialog.Cancel } MatrixText {