From 009eda749899fc85d3a75ad2016371f27436bf36 Mon Sep 17 00:00:00 2001
From: LAPTOP-T815PCOQ\25526 <mr.liuyang@126.com>
Date: 星期四, 09 一月 2025 14:04:16 +0800
Subject: [PATCH] Merge branch 'liuyang' into chenluhua
---
SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
index d8fc12f..d31d1c0 100644
--- a/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
+++ b/SourceCode/Bond/BoounionPLC/BoounionPLCDlg.cpp
@@ -358,6 +358,12 @@
m_pPagePlcList = nullptr;
}
+ if (m_pPageLogcat != nullptr) {
+ m_pPageLogcat->DestroyWindow();
+ delete m_pPageLogcat;
+ m_pPageLogcat = nullptr;
+ }
+
if (m_pMainContainer != nullptr) {
m_pMainContainer->DestroyWindow();
delete m_pMainContainer;
@@ -447,14 +453,12 @@
m_bShowLogWnd = !m_bShowLogWnd;
if (m_bShowLogWnd) {
- LOGD("显示日志窗口");
m_pPageLogcat->ShowWindow(SW_SHOW);
m_pPageLogcat->SetParent(m_pMainContainer);
m_pMainContainer->SetBottomWnd(m_pPageLogcat, LOG_WND_HEIGHT);
m_pMainContainer->Resize();
}
else {
- LOGD("隐藏日志窗口");
m_pPageLogcat->ShowWindow(SW_HIDE);
m_pPageLogcat->SetParent(this);
m_pMainContainer->SetBottomWnd(nullptr, 0);
--
Gitblit v1.9.3