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

libobs, UI: reset hotkey description on target rename #1310

Merged
merged 3 commits into from Jun 17, 2018

Conversation

Projects
None yet
3 participants
@vokama
Copy link
Contributor

commented May 29, 2018

Hotkey description and/or name should be reset each time its registerer's name (or similiar data) is changed.

Fixes Hotkey of show & hide source never update description after renaming source.

@RytoEX
Copy link
Contributor

left a comment

Hi! Congrats on your first PR here! To help out, I've reviewed this PR, mostly for conformance with this project's style guidelines.

I've requested one style change. Additionally, please capitalize the first word of your commit message subjects after the commit message prefix.

@@ -1439,6 +1480,9 @@ static void obs_sceneitem_destroy(obs_sceneitem_t *item)
obs_data_release(item->private_settings);
obs_hotkey_pair_unregister(item->toggle_visibility);
pthread_mutex_destroy(&item->actions_mutex);
signal_handler_disconnect(
obs_source_get_signal_handler(item->source),

This comment has been minimized.

Copy link
@RytoEX

RytoEX Jun 2, 2018

Contributor

Style: Use two tabs to indent a line continuation (here and the next line).

@vokama vokama force-pushed the vokama:updated-hotkey-names branch from 356c481 to 0b4b127 Jun 2, 2018

@vokama

This comment has been minimized.

Copy link
Contributor Author

commented Jun 2, 2018

@RytoEX Hi! Thank you!
I have applied the requested style change and reworded commit messages as you suggested.

@vokama vokama force-pushed the vokama:updated-hotkey-names branch from 0b4b127 to 837412b Jun 4, 2018

@vokama vokama force-pushed the vokama:updated-hotkey-names branch from 837412b to 54ab27b Jun 4, 2018

@jp9000 jp9000 merged commit 446dc9f into obsproject:master Jun 17, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@vokama vokama deleted the vokama:updated-hotkey-names branch Jun 17, 2018

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.