Skip to content
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.

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

Fix early-use crash in folder watcher on Linux #11475

Merged
merged 1 commit into from
Jan 17, 2024

Conversation

erikjv
Copy link
Collaborator

@erikjv erikjv commented Jan 16, 2024

In a few error scenarios (out-of-memory or out-of-space), the folder watcher on Linux shows a dialog with an error message. If this occurs during start-up before the GUI is initialised, this will lead to a crash.

This is fixed by delaying the VFS start until after event loop is started, guaranteeing that the GUI is up and running.

Fixes: #11460

@erikjv erikjv requested a review from TheOneRing January 16, 2024 14:55
@erikjv erikjv self-assigned this Jan 16, 2024
@erikjv erikjv linked an issue Jan 16, 2024 that may be closed by this pull request
@erikjv erikjv force-pushed the work/fix-linux-folderwatcher-crash branch from a4bf609 to f32f86d Compare January 16, 2024 14:56
Copy link
Contributor

@TheOneRing TheOneRing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick

src/gui/folder.cpp Outdated Show resolved Hide resolved
@erikjv erikjv requested a review from TheOneRing January 17, 2024 14:20
In a few error scenarios (out-of-memory or out-of-space), the folder
watcher on Linux shows a dialog with an error message. If this occurs
during start-up before the GUI is initialised, this will lead to a
crash.

This is fixed by delaying the VFS start until after event loop is
started, guaranteeing that the GUI is up and running.

Fixes: #11460
@erikjv erikjv force-pushed the work/fix-linux-folderwatcher-crash branch from f32f86d to 9f054fe Compare January 17, 2024 19:27
@TheOneRing TheOneRing merged commit 82c7a2e into master Jan 17, 2024
6 of 7 checks passed
@delete-merged-branch delete-merged-branch bot deleted the work/fix-linux-folderwatcher-crash branch January 17, 2024 20:32
erikjv added a commit that referenced this pull request Jan 18, 2024
This is the fix for the crash in the folder watcher on Linux
TheOneRing pushed a commit that referenced this pull request Jan 18, 2024
This is the fix for the crash in the folder watcher on Linux
TheOneRing pushed a commit that referenced this pull request May 22, 2024
This is the fix for the crash in the folder watcher on Linux

(cherry picked from commit e170464)
TheOneRing pushed a commit that referenced this pull request May 23, 2024
This is the fix for the crash in the folder watcher on Linux

(cherry picked from commit e170464)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Folderwatcher access to Application::_instance before initialisation
2 participants