fixes crash on click on compact track label button

[BaraMGB]

fixes #3454

[jasp00]

It would be better if you unconditionally create and hide m_renameLineEdit in the constructor.

[BaraMGB]

Thank you for the help, @jasp00

[jasp00]

I do not get this workflow. master needs this patch too, but a direct commit overrides Travis guard.

[tresf]

I do not get this workflow. master needs this patch too, but a direct commit overrides Travis guard.

In regards to stable-x.x --> master, here's some examples of how we've done this in the past... 23f720f 815a70a 00cb2b1

[jasp00]

here's some examples of how we've done this in the past...

But these still override Travis checks.

[tresf]

But these still override Travis checks.

Are you trying to bypass the CI testing since it's already been merged? We don't do that and I'm not sure we want to.

[jasp00]

Oh, you do sync PRs, such as #1115, #1129, and #1148. How do you exclude patches specific to the stable branch?

[tresf]

How do you exclude patches specific to the stable branch?

Vesa used to hit these occasionally. If they don't apply to master chances are something has changed and they won't merge due to conflict.

The only way I'm aware is through the manual process of >>>>>>>>> conflict-resolution... e.g. 8b9868e

e.g.

# Conflicts:
#	src/gui/FileBrowser.cpp