Merge pull request #22027 from vitlibar/external-loader-small-simplification

Small simplification in ExternalLoader.
This commit is contained in:
Vitaly Baranov 2021-03-25 13:43:31 +03:00 committed by GitHub
commit f6f739eca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -818,13 +818,10 @@ private:
if (!min_id)
min_id = getMinIDToFinishLoading(forced_to_reload);
if (info->state_id >= min_id)
return true; /// stop
if (info->loading_id < min_id)
startLoading(*info, forced_to_reload, *min_id);
/// Wait for the next event if loading wasn't completed, and stop otherwise.
/// Wait for the next event if loading wasn't completed, or stop otherwise.
return (info->state_id >= min_id);
};
@ -850,9 +847,6 @@ private:
if (filter && !filter(name))
continue;
if (info.state_id >= min_id)
continue;
if (info.loading_id < min_id)
startLoading(info, forced_to_reload, *min_id);