Close button on map custom exit dialog not cancelling line drawing#432
Merged
vadi2 merged 1 commit intoMudlet:release_30from Mar 23, 2017
Merged
Conversation
…awing As per http://bugs.launchpad.net/mudlet/+bug/1369041 the built-in dialog button that some OS/Window systems provide did close the dialog but did not cancel the custom line drawing process. This fixes the matter by connecting the reject() signal that the button produces to code to clean up. During debugging this it became clear that: if the custom line dialog was being displayed but before the user had selected the exit to draw the line for, it was possible to click on the map and add points to create a line; this would be for a custom line with an Empty exit name which should not be permitted. To prevent this a flag "mDialogLock" was added to the class to prevent the mouse events that would draw or modify a custom line from proceeding until the custom line dialog had been used or cancelled. Signed-off-by: Stephen Lyons <slysven@virginmedia.com> (cherry picked from commit 07c6a3e)
Member
Author
|
Hopefully a big less merge conflicts to deal with in The Merge thanks to the resolutions done in this commit. |
SlySven
approved these changes
Mar 23, 2017
Member
SlySven
left a comment
There was a problem hiding this comment.
It looks like a good 🍒-pick does it do what it says on the tin for this branch? {If not I guess that would make it a 🍋-pick - leaving a sour taste behind - instead 🤣}
I'll assume that it works and thus give it approval.
Member
Author
|
I always test my work, yep!
…On Thu, 23 Mar 2017 3:32 am Stephen Lyons, ***@***.***> wrote:
***@***.**** approved this pull request.
It looks like a good 🍒-pick does it do what it says on the tin for this
branch? {If not I guess that would make it a 🍋-pick - leaving a sour
taste behind - instead 🤣}
I'll assume that it works and thus give it approval.
—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub
<#432 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAGxjMrcgNbfrLZg2-8F35YDrF51d8pOks5rodmjgaJpZM4Mlr7b>
.
|
This was referenced Mar 31, 2017
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-picked commit that fixed a crash when opening the custom exit lines dialog (because the point was not initialised properly), and a case where if X was used to close the dialog drawing was still commenced.
Original message below:
As per http://bugs.launchpad.net/mudlet/+bug/1369041 the built-in dialog
button that some OS/Window systems provide did close the dialog but did not
cancel the custom line drawing process. This fixes the matter by
connecting the reject() signal that the button produces to code to clean
up.
During debugging this it became clear that: if the custom line dialog was
being displayed but before the user had selected the exit to draw the line
for, it was possible to click on the map and add points to create a line;
this would be for a custom line with an Empty exit name which should not be
permitted. To prevent this a flag "mDialogLock" was added to the class to
prevent the mouse events that would draw or modify a custom line from
proceeding until the custom line dialog had been used or cancelled.
Signed-off-by: Stephen Lyons slysven@virginmedia.com
(cherry picked from commit 07c6a3e)