summary refs log tree commit diff
path: root/resources/qml/dialogs/RoomSettingsDialog.qml
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2024-03-14 01:00:31 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2024-03-14 01:01:12 +0100
commitd2009428b65047ec26492f0ff2a1c21f39647a02 (patch)
treeedba41c915b537278d876c35b6a511b8c14d89a2 /resources/qml/dialogs/RoomSettingsDialog.qml
parentMerge pull request #1692 from jjdredd/patch-1 (diff)
downloadnheko-d2009428b65047ec26492f0ff2a1c21f39647a02.tar.xz
workaround broken platform dialogs on macos
See https://bugreports.qt.io/browse/QTBUG-102078
Diffstat (limited to '')
-rw-r--r--resources/qml/dialogs/RoomSettingsDialog.qml7
1 files changed, 5 insertions, 2 deletions
diff --git a/resources/qml/dialogs/RoomSettingsDialog.qml b/resources/qml/dialogs/RoomSettingsDialog.qml
index 8e127567..b435e55b 100644
--- a/resources/qml/dialogs/RoomSettingsDialog.qml
+++ b/resources/qml/dialogs/RoomSettingsDialog.qml
@@ -554,13 +554,16 @@ ApplicationWindow {
                     text: qsTr(`Encryption is currently experimental and things might break unexpectedly. <br>
                                 Please take note that it can't be disabled afterwards.`)
                     modality: Qt.NonModal
-                    onAccepted: {
+                    // Broken on macos, see https://bugreports.qt.io/browse/QTBUG-102078
+                    //onAccepted: {
+                    onOkClicked: {
                         if (roomSettings.isEncryptionEnabled)
                             return ;
 
                         roomSettings.enableEncryption();
                     }
-                    onRejected: {
+                    //onRejected: {
+                    onCancelClicked: {
                         encryptionToggle.checked = false;
                     }
                     buttons: Platform.MessageDialog.Ok | Platform.MessageDialog.Cancel