Fix crash when not able to load cursor #8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danieldg
reviewed
Dec 12, 2023
| .get_cursor("default") | ||
| .expect("Could not load cursor, check XCURSOR_THEME") | ||
| .clone(); | ||
| .get_cursor("default").ok_or(String::from("Could not load cursor, check XCURSOR_THEME"))?; |
There was a problem hiding this comment.
You should just return if get_cursor is None, not of create a String that you then ignore. If you want to have an error message, use a log macro like warn!.
| mouse.set_cursor(serial, self.cursor_surf.as_ref(), x, y); | ||
| }, | ||
| None => { | ||
| _ = self.setup_cursor(wl); |
There was a problem hiding this comment.
The first time this function is run, it will fail to set the cursor even if the cursor is found. In fact, this function didn't need to change to address the error.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.