Browse Source

Moved position of top if statement to prevent premature enumeration exit

pull/658/head
ObsidianMinor 8 years ago
parent
commit
9c1daebf4d
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs

+ 4
- 4
src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs View File

@@ -43,13 +43,13 @@ namespace Discord

public async Task<bool> MoveNext(CancellationToken cancelToken)
{
if (_info.Remaining == 0)
return false;

if (_currentPage == null || _currentPageEnumerator == null || !_currentPageEnumerator.MoveNext())
{
_currentPageEnumerator?.Dispose();

if (_info.Remaining == 0)
return false;

var data = await _source._getPage(_info, cancelToken).ConfigureAwait(false);
_currentPage = new Page<T>(_info, data);
_currentPageEnumerator = _currentPage.GetEnumerator();
@@ -75,7 +75,7 @@ namespace Discord
_info.Remaining = 0;
}

_currentPageEnumerator.MoveNext();
return _currentPageEnumerator.MoveNext();
}

return true;


Loading…
Cancel
Save