Kill debug thread at mainwindow delete.
This commit is contained in:
@@ -161,10 +161,10 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||||||
}
|
}
|
||||||
qApp->processEvents();
|
qApp->processEvents();
|
||||||
});
|
});
|
||||||
connect(DeviceManager::Default(),&DeviceManager::raiseGlobalError,this,&MainWindow::triggerError,Qt::ConnectionType::QueuedConnection);
|
connect(DeviceManager::Default(),&DeviceManager::raiseGlobalError,this,&MainWindow::triggerError);
|
||||||
GUIErrorHandle::Default()->init();
|
GUIErrorHandle::Default()->init();
|
||||||
l = new LoginWindow(this);
|
l = new LoginWindow(this);
|
||||||
QThread* t = QThread::create([]() {
|
t = QThread::create([]() {
|
||||||
QThread::sleep(10);
|
QThread::sleep(10);
|
||||||
int f = 0x00100001;
|
int f = 0x00100001;
|
||||||
for (int i = 0; i < 8; ++i) {
|
for (int i = 0; i < 8; ++i) {
|
||||||
@@ -198,6 +198,8 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
{
|
{
|
||||||
|
t->terminate();
|
||||||
|
delete t;
|
||||||
delete ui;
|
delete ui;
|
||||||
delete redir;
|
delete redir;
|
||||||
}
|
}
|
||||||
@@ -240,7 +242,7 @@ QTextEdit* MainWindow::getEdit()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::requestLogin() {
|
void MainWindow::requestLogin() {
|
||||||
|
l->setParent(this);
|
||||||
l->clearInputData();
|
l->clearInputData();
|
||||||
l->setWindowModality(Qt::WindowModal);
|
l->setWindowModality(Qt::WindowModal);
|
||||||
l->showFullScreen();
|
l->showFullScreen();
|
||||||
@@ -249,6 +251,7 @@ void MainWindow::requestLogin() {
|
|||||||
{
|
{
|
||||||
l->exec();
|
l->exec();
|
||||||
}
|
}
|
||||||
|
l->setResult(QDialog::Rejected);
|
||||||
this->centerWidgetShow();
|
this->centerWidgetShow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ private:
|
|||||||
QTabWidget* tab = nullptr;
|
QTabWidget* tab = nullptr;
|
||||||
int admin_tab_index = -1;
|
int admin_tab_index = -1;
|
||||||
LoginWindow* l;
|
LoginWindow* l;
|
||||||
|
QThread* t;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // MAINWINDOW_H
|
#endif // MAINWINDOW_H
|
||||||
|
|||||||
Reference in New Issue
Block a user