diff options
| author |  waker <wakeroid@gmail.com> | 2011-04-24 10:56:24 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2011-04-24 10:56:24 +0200 |
| commit | 9a95191e0923d8fbaf35c4a5ba243e314a69c647 (patch) | |
| tree | 3512cc13ebaa431890c3987b411296f59998e956 /plugins/hotkeys | |
| parent | 2fefff9dfcbe3963641f08e4629d5573f41cecd0 (diff) | |
moved hotkeys init to plugin.start, to avoid race condition with gtk
Diffstat (limited to 'plugins/hotkeys')
| -rw-r--r-- | plugins/hotkeys/hotkeys.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/hotkeys/hotkeys.c b/plugins/hotkeys/hotkeys.c index 5b9c96ee..e026557b 100644 --- a/plugins/hotkeys/hotkeys.c +++ b/plugins/hotkeys/hotkeys.c @@ -462,6 +462,7 @@ hotkeys_event_loop (void *unused) { static int hotkeys_connect (void) { + printf ("hotkeys_connect\n"); finished = 0; loop_tid = 0; disp = XOpenDisplay (NULL); @@ -474,6 +475,7 @@ hotkeys_connect (void) { read_config (disp); XSync (disp, 0); + printf ("hotkeys_connect done\n"); loop_tid = deadbeef->thread_start (hotkeys_event_loop, 0); return 0; } @@ -718,8 +720,8 @@ static DB_hotkeys_plugin_t plugin = { , .misc.plugin.website = "http://deadbeef.sf.net", .misc.plugin.get_actions = hotkeys_get_actions, - .misc.plugin.connect = hotkeys_connect, - .misc.plugin.disconnect = hotkeys_disconnect, + .misc.plugin.start = hotkeys_connect, + .misc.plugin.stop = hotkeys_disconnect, .get_name_for_keycode = hotkeys_get_name_for_keycode, .reset = hotkeys_reset, }; |