| Revision | ac4df08e6b8ab3b5d8ca9b491e9783d60832e9c5 (tree) |
|---|---|
| Zeit | 2021-12-25 04:02:34 |
| Autor |  LoRd_MuldeR <mulder2@gmx....> |
| Commiter | LoRd_MuldeR |
Small improvement in OS detection code.
src/OSSupport_Win32.cpp (diff)| @@ -450,14 +450,13 @@ const MUtils::OS::Version::os_version_t &MUtils::OS::os_version(void) | ||
| 450 | 450 | const char *MUtils::OS::os_friendly_name(const MUtils::OS::Version::os_version_t &os_version) |
| 451 | 451 | { |
| 452 | 452 | const char *friendly_name = NULL; |
| 453 | - for(size_t i = 0; g_os_version_lut[i].version.type != MUtils::OS::Version::OS_UNKNOWN; i++) | |
| 453 | + for (size_t i = 0; g_os_version_lut[i].version.type != MUtils::OS::Version::OS_UNKNOWN; i++) | |
| 454 | 454 | { |
| 455 | - if(os_version >= g_os_version_lut[i].version) | |
| 455 | + const MUtils::OS::Version::os_version_t &version = g_os_version_lut[i].version; | |
| 456 | + if ((os_version.versionMajor == version.versionMajor) && (os_version.versionMinor == version.versionMinor) && (os_version.versionBuild >= version.versionBuild)) | |
| 456 | 457 | { |
| 457 | 458 | friendly_name = g_os_version_lut[i].friendlyName; |
| 458 | - continue; | |
| 459 | 459 | } |
| 460 | - break; | |
| 461 | 460 | } |
| 462 | 461 | |
| 463 | 462 | return friendly_name; |
| @@ -1785,7 +1784,7 @@ const QLatin1String &MUtils::OS::null_device(void) | ||
| 1785 | 1784 | // DEBUGGER CHECK |
| 1786 | 1785 | /////////////////////////////////////////////////////////////////////////////// |
| 1787 | 1786 | |
| 1788 | -#if (!(MUTILS_DEBUG)) | |
| 1787 | +#if 0//(!(MUTILS_DEBUG)) | |
| 1789 | 1788 | static __forceinline bool is_debugger_present(void) |
| 1790 | 1789 | { |
| 1791 | 1790 | __try |
Fork