From d57ac39b0215bb92d24eda8793b5bf5efa518f6a Mon Sep 17 00:00:00 2001
From: Mike Kinney <mike.kinney@gmail.com>
Date: Thu, 17 Mar 2022 18:08:39 +0000
Subject: [PATCH] move the factory reset stuff above the ble bonds

---
 src/mesh/NodeDB.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index ca81fb037..204efcda4 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -97,6 +97,13 @@ bool NodeDB::resetRadioConfig()
         nvs_flash_erase();
 #endif
 #ifdef NRF52_SERIES
+
+    installDefaultDeviceState();
+    installDefaultRadioConfig();
+    installDefaultChannels();
+    saveToDisk();
+    saveChannelsToDisk();
+
     Bluefruit.begin();
 
     DEBUG_MSG("Clearing bluetooth bonds!\n");
@@ -106,11 +113,6 @@ bool NodeDB::resetRadioConfig()
     Bluefruit.Periph.clearBonds();
     Bluefruit.Central.clearBonds();
 
-    installDefaultDeviceState();
-    installDefaultRadioConfig();
-    installDefaultChannels();
-    saveToDisk();
-    saveChannelsToDisk();
 
 #endif
         didFactoryReset = true;