Skip to content

Conversation

enp2s0
Copy link
Contributor

@enp2s0 enp2s0 commented Apr 11, 2019

This fixes a crash when attempting to load a preset that was saved with controller connections into a project with no controllers (or fewer controllers than the preset's m_controllerId)

See issue #4927 for more info.

@enp2s0 enp2s0 mentioned this pull request Apr 11, 2019
@PhysSong
Copy link
Member

I think this change should target to stable-1.2 as it's a simple bug fix.

@enp2s0
Copy link
Contributor Author

enp2s0 commented Apr 11, 2019

Is there a reason we can’t apply it to both?

@PhysSong
Copy link
Member

Normally we apply fixes to stable-1.2 first and then merge the branch into master.

@enp2s0 enp2s0 closed this Apr 11, 2019
@enp2s0 enp2s0 reopened this Apr 11, 2019
@enp2s0
Copy link
Contributor Author

enp2s0 commented Apr 11, 2019

Sorry didn’t mean to close this.

Anyway, can I simply change the target of this pr or do I have to remake it?

I would like to see the fix in master though, for me at least both branches are equally buggy and master has a lot of new features, so I use master for normal use.

@josh-audio
Copy link
Member

You can't just change the target of the PR, as that will attempt to merge all of the new features in master to stable 1.2. The easiest way to target this for 1.2 without git wizardry is to clone 1.2 and re-apply your changes. Your PR looks small so this should be trivial to do.

It's my understanding that bug fixes are regularly put into master from 1.2, so it's only a matter of time before this fix shows up in master.

@enp2s0
Copy link
Contributor Author

enp2s0 commented Apr 12, 2019

#4939 is this pr targeted against stable-1.2.

Should I close this or leave this open to allow it to be merged to master as well?

@PhysSong
Copy link
Member

Should I close this or leave this open to allow it to be merged to master as well?

We'll merge stable-1.2 into master to let master get fixes from stable-1.2.

@PhysSong PhysSong closed this Apr 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants