Backport "Merge PR #5773: FIX(client): Prefer selected tree item for context menu creation" to 1.4.x #5778
Conversation
This file contains hidden or 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
Combines copied code for user, listener and channel context menu creation. Creates a unified method returning a std::tuple of ClientUser* and Channel*. Note that these might contain nullptr. (cherry picked from commit 9097b5a)
A previous oversight in 4f5089f let the previously selected context menu items take precedence over the currently selected tree item. This commit introduces the necessary nullptr check to make sure that the previous context menu item is only used as fallback, if the lookup of the selected item fails. Fixes mumble-voip#3090 (cherry picked from commit 4d5d08c)
3 tasks
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.
Backport
This will backport the following commits from
masterto1.4.x:Questions ?
Please refer to the Backport tool documentation