Skip to content
Permalink
Browse files

OSInfo: fix display of Windows service packs in getOSDisplayableVersion.

I botched this when I did a few fix-ups while merging.
  • Loading branch information...
mkrautz committed Jan 11, 2014
1 parent 1eefaab commit 1d0b1c86d4e18b8b1f8ae3546792ce3a3bd206be
Showing with 5 additions and 1 deletion.
  1. +5 −1 src/OSInfo.cpp
@@ -334,7 +334,11 @@ QString OSInfo::getOSDisplayableVersion() {

// Service Packs (may be empty)
static_assert(sizeof(TCHAR) == sizeof(wchar_t), "Expected Unicode TCHAR.");
osdispver.append(QString::fromWCharArray(ovi.szCSDVersion));
QString sp = QString::fromWCharArray(ovi.szCSDVersion);
if (!sp.isEmpty()) {
osdispver.append(QLatin1String(" "));
osdispver.append(sp);
}

// Architecture
if (ovi.dwMajorVersion >= 6) {

0 comments on commit 1d0b1c8

Please sign in to comment.
You can’t perform that action at this time.