Merged revision(s) 24800 from trunk/OpenMPT:

manxorist · manxorist · commit 50e09d91cf10 · 2026-01-15T13:58:59.000Z
[Fix] Update Check: Assume that updates are unsupported if we cannot parse the Wine version. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.32@24801 56274372-70c3-4bfc-bfc3-4c3a0b034d27
diff --git a/mptrack/UpdateCheck.cpp b/mptrack/UpdateCheck.cpp
@@ -306,6 +306,10 @@ static UpdateInfo GetBestDownload(const Update::versions &versions)
 				download_supported = false;
 			}
 
+			if(mpt::OS::Windows::IsWine() && !theApp.GetWineVersion()->Version().IsValid())
+			{
+				download_supported = false;
+			}
 			if(mpt::OS::Windows::IsWine() && theApp.GetWineVersion()->Version().IsValid())
 			{
 				if(theApp.GetWineVersion()->Version().IsBefore(mpt::OS::Wine::Version(mpt::saturate_cast<uint8>(download.required_windows_version->wine_major), mpt::saturate_cast<uint8>(download.required_windows_version->wine_minor), mpt::saturate_cast<uint8>(download.required_windows_version->wine_update))))

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,10 @@ static UpdateInfo GetBestDownload(const Update::versions &versions)`
`306`	`306`	`download_supported = false;`
`307`	`307`	`}`
`308`	`308`
	`309`	`+ if(mpt::OS::Windows::IsWine() && !theApp.GetWineVersion()->Version().IsValid())`
	`310`	`+ {`
	`311`	`+ download_supported = false;`
	`312`	`+ }`
`309`	`313`	`if(mpt::OS::Windows::IsWine() && theApp.GetWineVersion()->Version().IsValid())`
`310`	`314`	`{`
`311`	`315`	`if(theApp.GetWineVersion()->Version().IsBefore(mpt::OS::Wine::Version(mpt::saturate_cast<uint8>(download.required_windows_version->wine_major), mpt::saturate_cast<uint8>(download.required_windows_version->wine_minor), mpt::saturate_cast<uint8>(download.required_windows_version->wine_update))))`