Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions src/dfm-io/dfm-io/denumerator.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2020 - 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2020 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down Expand Up @@ -644,12 +644,6 @@ bool DEnumerator::hasNext() const

g_object_unref(nextInfo);

if (gerror) {
d->setErrorFromGError(gerror);
g_error_free(gerror);
gerror = nullptr;
}

if (!d->checkFilter())
return this->hasNext();

Expand All @@ -659,9 +653,20 @@ bool DEnumerator::hasNext() const
// nextInfo == NULL: either finished or an error occurred
if (gerror) {
d->setErrorFromGError(gerror);
d->nextUrl = QUrl();
d->dfileInfoNext.reset();
return true;
}

// 枚举完成,关闭并释放当前枚举器,释放 fd
if (!d->stackEnumerator.isEmpty()) {
GFileEnumerator *enumerator = d->stackEnumerator.pop();
if (enumerator) {
g_file_enumerator_close(enumerator, nullptr, nullptr);
g_object_unref(enumerator);
}
}

return false;
}

Expand Down
2 changes: 1 addition & 1 deletion src/dfm-io/dfm-io/private/denumerator_p.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2020 - 2023 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2020 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand Down
Loading