test shutdown release socket again

Author: code4lala

.gitignore

@@ -47,3 +47,4 @@ CMakeLists.txt.user*
 .vs
 .vscode
 *.code-workspace
+*.zip

main.cpp

@@ -85,15 +85,12 @@ int main(int argc, char *argv[])
 	translator.load(":/ts/DrCOM_zh_CN.qm");
 	a.installTranslator(&translator);
 
-	MainWindow w;
+    MainWindow w(&a);
 	QObject::connect(&a, &SingleApplication::instanceStarted, [&w]() {
 		qDebug() << "One instance had started. Its window will be shown by the next line of the source code.";
 		w.ShowLoginWindow();
 	});
 
-    // 关机时接收退出信号，释放socket
-    QObject::connect(&a, &SingleApplication::aboutToQuit, &w, &MainWindow::QuitDrcom);
-
     QSettings s(SETTINGS_FILE_NAME);
     bool bHideWindow=s.value(ID_HIDE_WINDOW, false).toBool();
 	// 如果是软件自行重启的就不显示窗口

mainwindow.cpp

@@ -16,10 +16,14 @@
 #include <QCloseEvent>
 #include <QProcess>
 
-MainWindow::MainWindow(QWidget *parent) :
-	QDialog(parent),
-	ui(new Ui::MainWindow)
+MainWindow::MainWindow(SingleApplication *parentApp, QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::MainWindow),
+    app(parentApp)
 {
+    // 关机时接收退出信号，释放socket
+    QObject::connect(app, &SingleApplication::aboutToQuit, this, &MainWindow::QuitDrcom);
+
     qDebug()<<"MainWindow constructor";
 	ui->setupUi(this);
 

mainwindow.h

@@ -6,6 +6,7 @@
 #include <QRegExpValidator>
 #include <dogcomcontroller.h>
 #include <QSystemTrayIcon>
+#include "singleapplication.h"
 
 namespace Ui {
 	class MainWindow;
@@ -16,7 +17,7 @@ class MainWindow : public QDialog
 	Q_OBJECT
 
 public:
-	explicit MainWindow(QWidget *parent = nullptr);
+    explicit MainWindow(SingleApplication *parentApp=nullptr, QWidget *parent = nullptr);
 	~MainWindow() override;
 
 	void closeEvent(QCloseEvent *) override;
@@ -44,6 +45,7 @@ public slots:
 
 private:
 	Ui::MainWindow *ui;
+    SingleApplication *app=nullptr;
 	const QString CUSTOM_MAC = tr("custom (format: 1A:2B:3C:4D:5E:6F case insensitive)");
 	const QString APP_NAME = tr("DrCOM JLU Qt version");