Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: One second timeout to get version, see #279

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-09-22 18:09:43 +02:00
parent 8b2d787c77
commit d6b0f49db2
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
code/ryzom/tools/client/ryzom_installer/src/utils.cpp
View file

@ -260,17 +260,20 @@ QString getVersionFromExecutable(const QString &path)
QByteArray data; QByteArray data;
// read all output // read all output
while (process.waitForReadyRead()) data.append(process.readAll()); while (process.waitForReadyRead(1000)) data.append(process.readAll());
QString versionString = QString::fromUtf8(data); if (!data.isEmpty())
{
QString versionString = QString::fromUtf8(data);
// parse version from output (client) // parse version from output (client)
QRegExp reg("([A-Za-z0-1_.]+) ((DEV|FV) ([0-9.]+))"); QRegExp reg("([A-Za-z0-1_.]+) ((DEV|FV) ([0-9.]+))");
if (reg.indexIn(versionString) > -1) return reg.cap(2); if (reg.indexIn(versionString) > -1) return reg.cap(2);
// parse version from output (other tools) // parse version from output (other tools)
reg.setPattern("([A-Za-z_ ]+) ([0-9.]+)"); reg.setPattern("([A-Za-z_ ]+) ([0-9.]+)");
if (reg.indexIn(versionString) > -1) return reg.cap(2); if (reg.indexIn(versionString) > -1) return reg.cap(2);
}
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// try to parse version of executable in resources // try to parse version of executable in resources