Skip to content

修改注释 #9

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

Closed
clcmj wants to merge 3 commits into from
Closed

修改注释 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8610af9
fix: bug-53921
PythonMan-YueYue Feb 9, 2021
bbafd38
chore: Merge 1040
Sep 16, 2021
ecdd757
修改注释
clcmj Feb 25, 2022
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
2 changes: 1 addition & 1 deletion deepin-devicemanager-server/src/LoadInfo/ThreadPool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void ThreadPool::initCmd()
m_ListCmd.append(cmdHwinfoKeyboard);
m_ListUpdate.append(cmdHwinfoKeyboard);

// 添加hwinfo --network命令
// 添加hwinfo --cdrom命令
Cmd cmdHwinfoCdrom;
cmdHwinfoCdrom.cmd = QString("%1 %2%3").arg("hwinfo --cdrom > ").arg(PATH).arg("hwinfo_cdrom.txt");
cmdHwinfoCdrom.file = "hwinfo_cdrom.txt";
Expand Down
3 changes: 2 additions & 1 deletion deepin-devicemanager/src/LoadInfo/DeviceGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,9 @@ void DeviceGenerator::generatorCpuDevice()
}

// 如果获取不到逻辑数，就按照core算 bug53921
if (logicalNum == 0)
if (logicalNum == 0) {
logicalNum = coreNum;
}

QList<QMap<QString, QString> >::const_iterator it = lsCpu.begin();
for (; it != lsCpu.end(); ++it) {
Expand Down