Merge pull request #835 from Spartan322/4.3-fix/update-behavior

Spartan322 · web-flow · commit dceac0ae5bbc · 2024-11-03T13:48:39.000Z
[4.3] Fix ignoring status_version for updating
diff --git a/editor/engine_update_label.cpp b/editor/engine_update_label.cpp
@@ -141,7 +141,8 @@ void EngineUpdateLabel::_http_request_completed(int p_result, int p_response_cod
 			break;
 		}
 
-		int current_version_index;
+		int current_version_index = current_version_info.get("status_version", 0);
+		current_version_index = current_version_index > 0 ? current_version_index : DEV_VERSION;
 		VersionType current_version_type = _get_version_type(current_version_info.get("status", "unknown"), &current_version_index);
 
 		if (int(release_type) > int(current_version_type)) {
@@ -231,7 +232,7 @@ EngineUpdateLabel::VersionType EngineUpdateLabel::_get_version_type(const String
 		}
 	}
 
-	if (r_index) {
+	if (r_index && *r_index == DEV_VERSION) {
 		if (index_string.is_empty()) {
 			*r_index = DEV_VERSION;
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,8 @@ void EngineUpdateLabel::_http_request_completed(int p_result, int p_response_cod`
`141`	`141`	`break;`
`142`	`142`	`}`
`143`	`143`
`144`		`- int current_version_index;`
	`144`	`+ int current_version_index = current_version_info.get("status_version", 0);`
	`145`	`+ current_version_index = current_version_index > 0 ? current_version_index : DEV_VERSION;`
`145`	`146`	`VersionType current_version_type = _get_version_type(current_version_info.get("status", "unknown"), &current_version_index);`
`146`	`147`
`147`	`148`	`if (int(release_type) > int(current_version_type)) {`
`@@ -231,7 +232,7 @@ EngineUpdateLabel::VersionType EngineUpdateLabel::_get_version_type(const String`
`231`	`232`	`}`
`232`	`233`	`}`
`233`	`234`
`234`		`- if (r_index) {`
	`235`	`+ if (r_index && *r_index == DEV_VERSION) {`
`235`	`236`	`if (index_string.is_empty()) {`
`236`	`237`	`*r_index = DEV_VERSION;`
`237`	`238`	`} else {`