Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kinfocenter: return true if ReadPipe() successedes in get_dri_device()

Browse source 
on a side note - get_dri_device() is broken on Linux and FreeBSD due to
changes in Linux and FreeBSD, not tested on DragonFly BSD

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-02-15 16:07:20 +02:00
parent e6303d29f3
commit 742ab11442
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
kinfocenter/Modules/opengl/opengl.cpp
View file

@ -158,7 +158,7 @@ static int ReadPipe(QString FileName, QStringList &list)
FILE *pipe;
if ((pipe = popen(FileName.toAscii().data(), "r")) == NULL) {
return 0;
return 0;
}
QTextStream t(pipe, QIODevice::ReadOnly);
@ -166,8 +166,8 @@ static int ReadPipe(QString FileName, QStringList &list)
while (!t.atEnd()) list.append(t.readLine());
if (pclose(pipe) != 0) {
list.clear();
return 0;
list.clear();
return 0;
}
return list.count();
}
@ -181,7 +181,7 @@ static bool get_dri_device()
QFile file;
file.setFileName(INFO_DRI);
if (!file.exists() || !file.open(QIODevice::ReadOnly))
return false;
return false;
QTextStream stream(&file);
QString line = stream.readLine();
@ -228,11 +228,12 @@ static bool get_dri_device()
static bool get_dri_device() {
QStringList pci_info;
if (ReadPipe("sysctl -n hw.dri.0.name",pci_info)) {
dri_info.module = pci_info[0].mid(0, pci_info[0].indexOf(0x20));
}
return false;
QStringList pci_info;
if (ReadPipe("sysctl -n hw.dri.0.name",pci_info)) {
dri_info.module = pci_info[0].mid(0, pci_info[0].indexOf(0x20));
return true;
}
return false;
}
#else