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 inversion of export library dialogs, fix #16317, fix #16358 #8356

Merged
merged 2 commits into from Nov 18, 2015

Conversation

Projects
None yet
4 participants
@MilhouseVH

This comment has been minimized.

Copy link
Contributor Author

MilhouseVH commented Nov 5, 2015

This isn't the right fix, investigating further...

@MilhouseVH MilhouseVH force-pushed the MilhouseVH:fix_export_dialog branch from e76857c to 3b11d53 Nov 5, 2015

@MilhouseVH

This comment has been minimized.

Copy link
Contributor Author

MilhouseVH commented Nov 5, 2015

This should be the correct fix for the singleFile inversion issue.

Added a second commit that clears the cancelled flag before the dialog is opened otherwise a cancelled YesNo dialog will continually be seen as cancelled even if a Yes or No button is clicked.

@MilhouseVH MilhouseVH force-pushed the MilhouseVH:fix_export_dialog branch 10 times, most recently from f07b2ba to 70a25f8 Nov 6, 2015

@MilhouseVH MilhouseVH changed the title Fix inversion of export library dialogs, fixes #16358 Fix inversion of export library dialogs, fix #16317, fix #16358 Nov 6, 2015

@MilhouseVH MilhouseVH force-pushed the MilhouseVH:fix_export_dialog branch from b79becb to de6207b Nov 6, 2015

@MilhouseVH

This comment has been minimized.

Copy link
Contributor Author

MilhouseVH commented Nov 6, 2015

Squashed an update to first commit after testing with JSON.

@MilhouseVH

This comment has been minimized.

Copy link
Contributor Author

MilhouseVH commented Nov 6, 2015

Now tested successfully exporting library to single or separate files via GUI, JSON and exportlibrary() builtin.

@mkortstiege

This comment has been minimized.

Copy link
Member

mkortstiege commented Nov 6, 2015

@Paxxi mind having a look. I think you've and someone else changed it around the last few merge windows ;)

@Paxxi

This comment has been minimized.

Copy link
Member

Paxxi commented Nov 17, 2015

I tried exporting without this and found no odd behaviour, need to try this and read through the code before commenting. Will make some time for it before next window, hopefully tomorrow

@MilhouseVH

This comment has been minimized.

Copy link
Contributor Author

MilhouseVH commented Nov 17, 2015

@Paxxi: I just tried a build of master (07f691e) on Ubuntu and the export library dialog remains broken as per this PR... are you sure you're building master and not Isengard (this bug is not in the Isengard/15.2 branch)?

  1. The buttons are reversed - "Separate" prompts for a directory, "Single file" prompts with the thumbnails/fanart dialog (should be the other way around)

​2) Click Export... then cancel the dialog (doesn't matter which dialog: Separate/Single file, Thumbnails/Fanart, or the Actors dialog - they're all instances of the same Yes/No dialog) then click on Export... again. Click on either button and nothing happens, the dialog just closes as the Yes/No dialog is now forever considered "cancelled" no matter what button is clicked, as the m_bCanceled flag is never cleared before the dialog is shown.

@Paxxi

This comment has been minimized.

Copy link
Member

Paxxi commented Nov 18, 2015

fix looks good, thanks for the explanation @MilhouseVH

Paxxi added a commit that referenced this pull request Nov 18, 2015

Merge pull request #8356 from MilhouseVH/fix_export_dialog
Fix inversion of export library dialogs, fix #16317, fix #16358

@Paxxi Paxxi merged commit 46130fc into xbmc:master Nov 18, 2015

@Paxxi Paxxi added this to the Jarvis 16.0-beta2 milestone Nov 18, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.