Merge pull request #791 from Nheko-Reborn/secret-storage-fixes

Move away from using an event loop to access secrets

2 files changed, 2 insertions, 2 deletions

diff --git a/resources/qml/dialogs/LogoutDialog.qml b/resources/qml/dialogs/LogoutDialog.qml

index eb82dd15..c571a89e 100644
--- a/resources/qml/dialogs/LogoutDialog.qml
+++ b/resources/qml/dialogs/LogoutDialog.qml
@@ -14,6 +14,6 @@ MessageDialog {
     text: CallManager.isOnCall ? qsTr("A call is in progress. Log out?") : qsTr("Are you sure you want to log out?")
     modality: Qt.WindowModal
     flags: Qt.Tool | Qt.WindowStaysOnTopHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
-    buttons: Dialog.Ok | Dialog.Cancel
+    buttons: MessageDialog.Ok | MessageDialog.Cancel
     onAccepted: Nheko.logout()
 }
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 {