Browse Source

Merge pull request #41302 from Jlalond/divide-by-zero

Update ResourceLoaderText::load to not update progress if resources a…
Rémi Verschelde 5 years ago
parent
commit
a17fba3f21
1 changed files with 3 additions and 3 deletions
  1. 3 3
      scene/resources/resource_format_text.cpp

+ 3 - 3
scene/resources/resource_format_text.cpp

@@ -572,7 +572,7 @@ Error ResourceLoaderText::load() {
 			}
 			}
 		}
 		}
 
 
-		if (progress) {
+		if (progress && resources_total > 0) {
 			*progress = resource_current / float(resources_total);
 			*progress = resource_current / float(resources_total);
 		}
 		}
 	}
 	}
@@ -640,7 +640,7 @@ Error ResourceLoaderText::load() {
 				return error;
 				return error;
 			} else {
 			} else {
 				error = OK;
 				error = OK;
-				if (progress) {
+				if (progress && resources_total > 0) {
 					*progress = resource_current / float(resources_total);
 					*progress = resource_current / float(resources_total);
 				}
 				}
 
 
@@ -674,7 +674,7 @@ Error ResourceLoaderText::load() {
 
 
 		resource_current++;
 		resource_current++;
 
 
-		if (progress) {
+		if (progress && resources_total > 0) {
 			*progress = resource_current / float(resources_total);
 			*progress = resource_current / float(resources_total);
 		}
 		}