fix #21

Author: sanny32

omodsim/formmodsim.cpp

@@ -69,7 +69,6 @@ FormModSim::FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSim
 ///
 FormModSim::~FormModSim()
 {
-    _mbMultiServer.removeUnitMap(formId());
     delete ui;
 }
 
@@ -94,6 +93,8 @@ void FormModSim::changeEvent(QEvent* e)
 ///
 void FormModSim::closeEvent(QCloseEvent *event)
 {
+    _mbMultiServer.removeUnitMap(formId());
+
     emit closing();
     QWidget::closeEvent(event);
 }

omodsim/mainwindow.cpp

@@ -1255,11 +1255,6 @@ void MainWindow::loadConfig(const QString& filename)
         return;
 
     ui->mdiArea->closeAllSubWindows();
-    for(auto&& filename: listFilename)
-    {
-        if(!filename.isEmpty())
-            openFile(filename);
-    }
 
     auto menu = qobject_cast<MenuConnect*>(ui->actionConnect->menu());
     menu->updateConnectionDetails(conns);
@@ -1269,6 +1264,12 @@ void MainWindow::loadConfig(const QString& filename)
         if(menu->canConnect(cd))
             _mbMultiServer.connectDevice(cd);
     }
+
+    for(auto&& filename: listFilename)
+    {
+        if(!filename.isEmpty())
+            openFile(filename);
+    }
 }
 
 ///