Refs #95. Revised app closing paths and fixed possible issues

introlab · Oct 9, 2024 · dd66a77 · dd66a77
1 parent 0dd1335
commit dd66a77
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/client/src/ClientApp.cpp b/client/src/ClientApp.cpp
@@ -59,11 +59,18 @@ ClientApp::~ClientApp()
         delete m_loginDiag;
 
     if (m_comMan){
-        m_comMan->disconnectFromServer();
+        //m_comMan->disconnect();
+        //m_comMan->disconnectFromServer();
         //m_comMan->deleteLater();
         delete m_comMan;
     }
 
+    if (m_mainWindow){
+        delete m_mainWindow;
+    }
+    if (m_mainKitWindow)
+        delete m_mainKitWindow;
+
 }
 
 ComManager *ClientApp::getComManager()
@@ -124,6 +131,7 @@ void ClientApp::showLogin()
 #ifndef OPENTERA_WEBASSEMBLY
         m_loginDiag = new WebLoginDialog(&m_config);
         connect(m_loginDiag, &WebLoginDialog::loginSuccess, this, &ClientApp::onLoginSuccess, Qt::QueuedConnection);
+        connect(m_loginDiag, &WebLoginDialog::finished,     this, &ClientApp::loginQuitRequested);
 #else
         m_loginDiag = new LoginDialog();
         connect(m_loginDiag, &LoginDialog::loginRequest,    this, &ClientApp::loginRequested);
@@ -297,7 +305,7 @@ void ClientApp::loginRequested(QString username, QString password, QString serve
 void ClientApp::logoutRequested()
 {
     m_comMan->disconnectFromServer();
-    showLogin();
+    //showLogin();
 }
 
 void ClientApp::on_loginResult(bool logged, QString log_msg)
@@ -355,6 +363,7 @@ void ClientApp::on_serverDisconnected()
 {
     LOG_DEBUG("Disconnected from server.", "ClientApp::on_serverDisconnected");
     showLogin();
+
 }
 
 void ClientApp::on_serverError(QAbstractSocket::SocketError error, QString error_str)

diff --git a/client/src/main.cpp b/client/src/main.cpp
@@ -29,5 +29,7 @@ int main(int argc, char* argv[])
     //QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::JavascriptEnabled, true);
     //QWebEngineSettings::defaultSettings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, true);
 
-    return app.exec();
+    int rval = app.exec();
+    qDebug() << "Bye!";
+    return rval;
 }
diff --git a/client/src/main/MainWindow.cpp b/client/src/main/MainWindow.cpp
@@ -252,7 +252,7 @@ void MainWindow::showDashboard(const bool &show)
         }
 
         if (!m_dashboard){
-            m_dashboard = new DashboardWidget(m_comManager, ui->projNavigator->getCurrentSiteId());
+            m_dashboard = new DashboardWidget(m_comManager, ui->projNavigator->getCurrentSiteId(), this);
             connect(m_dashboard, &DashboardWidget::dataDisplayRequest, this, &MainWindow::dataDisplayRequested);
             ui->wdgMainTop->layout()->addWidget(m_dashboard);
         }else{
@@ -1058,6 +1058,8 @@ void MainWindow::closeEvent(QCloseEvent *event)
         }
     }
 #endif
+    m_comManager->disconnect();
+    //QApplication::quit();
     event->accept();
 }