Skip to content

fix: change static firstLoadFlag to instance member #866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 2 commits into from
Oct 27, 2026
+5 −5
Merged

fix: change static firstLoadFlag to instance member #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c1e92d
fix: change static firstLoadFlag to instance member
add-uos Oct 22, 2026
f2cb05a
chore: update SPDX copyright year to 2022-2026 (CI SPDX check)
add-uos Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions deepin-devicemanager/src/GenerateDevice/LoadInfoThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -20,14 +20,14 @@

using namespace DDLog;
DWIDGET_USE_NAMESPACE
static bool firstLoadFlag = true;

LoadInfoThread::LoadInfoThread()
: mp_ReadFilePool()
, mp_GenerateDevicePool()
, m_Running(false)
, m_FinishedReadFilePool(false)
, m_Start(true)
, m_FirstLoadFlag(true)
{
qCDebug(appLog) << "LoadInfoThread constructor";
connect(&mp_ReadFilePool, &GetInfoPool::finishedAll, this, &LoadInfoThread::slotFinishedReadFilePool);
Expand Down Expand Up @@ -134,9 +134,9 @@ void LoadInfoThread::slotFinishedReadFilePool(const QString &)
qCDebug(appLog) << "LoadInfoThread::slotFinishedReadFilePool";
m_FinishedReadFilePool = true;
// 首次加载刷新
if (firstLoadFlag) {
if (m_FirstLoadFlag) {
qCDebug(appLog) << "LoadInfoThread::slotFinishedReadFilePool first load, emit finishedReadFilePool";
firstLoadFlag = false;
m_FirstLoadFlag = false;
emit finishedReadFilePool();
}
}
Expand All @@ -147,4 +147,3 @@ void LoadInfoThread::setFramework(const QString &arch)
// 设置架构
mp_ReadFilePool.setFramework(arch);
}

1 change: 1 addition & 0 deletions deepin-devicemanager/src/GenerateDevice/LoadInfoThread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ private slots:
bool m_Running; //<! 标识是否正在运行
bool m_FinishedReadFilePool; //<! 标识生成读文件的线程池是否结束
bool m_Start; //<! 是否为启动
bool m_FirstLoadFlag; //<! 标识是否为首次加载

};

Expand Down
Loading