rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5603 Ignore exceptions in getOSInformation()

This commit is contained in:
Andrew Nelless 2016-09-30 15:52:24 +01:00 committed by Andrew Nelless
parent 088ac82e18
commit 02d75cd370
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/src/QUtility.cpp
View File

@ -114,6 +114,8 @@ QString getOSInformation()
QString result; QString result;
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
result = "Linux";
try {
QStringList arguments; QStringList arguments;
arguments.append("/etc/os-release"); arguments.append("/etc/os-release");
CommandProcess cp("/bin/cat", arguments); CommandProcess cp("/bin/cat", arguments);
@ -121,8 +123,9 @@ QString getOSInformation()
QRegExp resultRegex(".*PRETTY_NAME=\"([^\"]+)\".*"); QRegExp resultRegex(".*PRETTY_NAME=\"([^\"]+)\".*");
if (resultRegex.exactMatch(output)) { if (resultRegex.exactMatch(output)) {
QString OSInfo = resultRegex.cap(1); result = resultRegex.cap(1);
result = OSInfo; }
} catch (...) {
} }
#endif #endif