Skip to content

Address crash during global search #1660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Address crash during global search #1660

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdf803d
Guard against simultaneous access of `loading_required` property duri…
jeremypw Nov 6, 2025
cdede6d
Merge branch 'master' into jeremypw/guard-global-search-crash
jeremypw Nov 6, 2025
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
38 changes: 21 additions & 17 deletions src/FolderManager/FolderItem.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace Scratch.FolderManager {
private bool has_dummy;
private Code.Widgets.SourceList.Item dummy; /* Blank item for expanded empty folders */

public bool loading_required {
private bool loading_required {
get {
return !children_loaded && n_children <= 1 && file.children.size > 0;
}
Expand Down Expand Up @@ -64,29 +64,33 @@ namespace Scratch.FolderManager {


public void load_children () {
if (loading_required) {
foreach (var child in file.children) {
add_child (child);
}
lock (loading_required) {
if (loading_required) {
foreach (var child in file.children) {
add_child (child);
}

after_children_loaded ();
after_children_loaded ();
}
}
}

private async void load_children_async () {
if (loading_required) {
foreach (var child in file.children) {
Idle.add (() => {
add_child (child);
load_children_async.callback ();
return Source.REMOVE;
});

yield;
lock (loading_required) {
if (loading_required) {
foreach (var child in file.children) {
Idle.add (() => {
add_child (child);
load_children_async.callback ();
return Source.REMOVE;
});

yield;
}
}
}

after_children_loaded ();
after_children_loaded ();
}
}

private void add_child (File child) {
Expand Down