From b016aa0f7dcd6b054e2e476c59299724564af3bf Mon Sep 17 00:00:00 2001
From: Malcolm <none@none>
Date: Wed, 10 Jul 2019 19:12:14 +0000
Subject: [PATCH] FIX OEMO default setting in wrong place (#1476)

---
 src/converse-omemo.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/converse-omemo.js b/src/converse-omemo.js
index a627f261e..ba6e2461d 100644
--- a/src/converse-omemo.js
+++ b/src/converse-omemo.js
@@ -84,9 +84,6 @@ converse.plugins.add('converse-omemo', {
 
             initialize () {
                 const { _converse } = this.__super__;
-                _converse.api.settings.update({
-                    'omemo_default': false,
-                });
                 this.debouncedRender = _.debounce(this.render, 50);
                 this.devicelist = _converse.devicelists.get(_converse.bare_jid);
                 this.devicelist.devices.on('change:bundle', this.debouncedRender, this);
@@ -247,6 +244,10 @@ converse.plugins.add('converse-omemo', {
         const { _converse } = this,
               { __ } = _converse;
 
+        _converse.api.settings.update({
+            'omemo_default': false,
+        });
+
         _converse.api.promises.add(['OMEMOInitialized']);
 
         _converse.NUM_PREKEYS = 100; // Set here so that tests can override