From 6c6965a074756985bf14074dfdf4e20fd4ff31cd Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Fri, 14 Jan 2022 14:23:01 +0800
Subject: [PATCH] Kill debug thread at mainwindow delete.

---
 src/mainwindow.cpp | 9 ++++++---
 src/mainwindow.h   | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4c27508..ecabe57 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -161,10 +161,10 @@ MainWindow::MainWindow(QWidget* parent) :
 		}
 		qApp->processEvents();
 		});
-    connect(DeviceManager::Default(),&DeviceManager::raiseGlobalError,this,&MainWindow::triggerError,Qt::ConnectionType::QueuedConnection);
+    connect(DeviceManager::Default(),&DeviceManager::raiseGlobalError,this,&MainWindow::triggerError);
     GUIErrorHandle::Default()->init();
     l = new LoginWindow(this);
-	QThread* t = QThread::create([]() {
+	t = QThread::create([]() {
 		QThread::sleep(10);
 		int f = 0x00100001;
 		for (int i = 0; i < 8; ++i) {
@@ -198,6 +198,8 @@ MainWindow::MainWindow(QWidget* parent) :
 
 MainWindow::~MainWindow()
 {
+    t->terminate();
+    delete t;
 	delete ui;
 	delete redir;
 }
@@ -240,7 +242,7 @@ QTextEdit* MainWindow::getEdit()
 }
 
 void MainWindow::requestLogin() {
-
+    l->setParent(this);
     l->clearInputData();
 	l->setWindowModality(Qt::WindowModal);
 	l->showFullScreen();
@@ -249,6 +251,7 @@ void MainWindow::requestLogin() {
 	{
 		l->exec();
 	}
+    l->setResult(QDialog::Rejected);
 	this->centerWidgetShow();
 }
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index ea06e64..dd8032c 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -46,6 +46,7 @@ private:
 	QTabWidget* tab = nullptr;
 	int admin_tab_index = -1;
     LoginWindow* l;
+    QThread* t;
 };
 
 #endif // MAINWINDOW_H