Merge pull request #832 from deXol/develop

limpkin · web-flow · commit 878215a9b84e · 2021-04-13T22:09:16.000+02:00
[BLE] Fix Fido import issues
diff --git a/src/MPDevice.cpp b/src/MPDevice.cpp
@@ -2905,7 +2905,7 @@ bool MPDevice::removeChildFromDB(MPNode* parentNodePt, MPNode* childNodePt, bool
                     parentNodePt->removeChild(childNodePt);
                     if (deleteFromList)
                     {
-                        loginChildNodes.removeOne(childNodePt);
+                        childNodes.removeOne(childNodePt);
                         delete childNodePt;
                     }
                     return true;
@@ -5680,7 +5680,7 @@ void MPDevice::startImportFileMerging(const MPDeviceProgressCb &cbProgress, Mess
     /* Load flash contents the usual way */
     memMgmtModeReadFlash(jobs, false,
                             cbProgress,
-                            true, true, true);
+                            true, true, true, true);
 
     connect(jobs, &AsyncJobs::finished, [this, cb, cbProgress, noDelete](const QByteArray &data)
     {

Original file line number	Diff line number	Diff line change
`@@ -2905,7 +2905,7 @@ bool MPDevice::removeChildFromDB(MPNode* parentNodePt, MPNode* childNodePt, bool`
`2905`	`2905`	`parentNodePt->removeChild(childNodePt);`
`2906`	`2906`	`if (deleteFromList)`
`2907`	`2907`	`{`
`2908`		`- loginChildNodes.removeOne(childNodePt);`
	`2908`	`+ childNodes.removeOne(childNodePt);`
`2909`	`2909`	`delete childNodePt;`
`2910`	`2910`	`}`
`2911`	`2911`	`return true;`
`@@ -5680,7 +5680,7 @@ void MPDevice::startImportFileMerging(const MPDeviceProgressCb &cbProgress, Mess`
`5680`	`5680`	`/* Load flash contents the usual way */`
`5681`	`5681`	`memMgmtModeReadFlash(jobs, false,`
`5682`	`5682`	`cbProgress,`
`5683`		`- true, true, true);`
	`5683`	`+ true, true, true, true);`
`5684`	`5684`
`5685`	`5685`	`connect(jobs, &AsyncJobs::finished, [this, cb, cbProgress, noDelete](const QByteArray &data)`
`5686`	`5686`	`{`