From 87d0fa1fcd75fff5354e8549f1ab3563beb0d548 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 14 十一月 2024 15:48:21 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh
---
SourceCode/Bond/BondEq/BondEqDlg.cpp | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/BondEq/BondEqDlg.cpp b/SourceCode/Bond/BondEq/BondEqDlg.cpp
index 63621f8..75bfce1 100644
--- a/SourceCode/Bond/BondEq/BondEqDlg.cpp
+++ b/SourceCode/Bond/BondEq/BondEqDlg.cpp
@@ -7,7 +7,7 @@
#include "BondEqDlg.h"
#include "afxdialogex.h"
#include "Common.h"
-#include "Bonder.h"
+#include "CBonder.h"
#include "SettingsDlg.h"
#include "UserManager.h"
#include "LoginDlg.h"
@@ -212,7 +212,6 @@
// Home页
m_pHomeDialog = CreateHomeDlg();
ShowWindow(SW_SHOWMAXIMIZED);
- SetTimer(2, 1000, nullptr);
InitRxWindows();
@@ -578,10 +577,7 @@
}
}
}
- else if (2 == nIDEvent) {
- KillTimer(2);
- theApp.m_model.createRemoteEqs();
- }
+
CDialogEx::OnTimer(nIDEvent);
}
--
Gitblit v1.9.3