(data->context != OB_FRAME_CONTEXT_CLIENT &&
data->context != OB_FRAME_CONTEXT_FRAME))
{
- actions_client_move(data, TRUE);
- client_activate(data->client, o->here, FALSE, FALSE, TRUE);
- actions_client_move(data, FALSE);
+ if (!(data->client->iconic && actions_client_locked(data))) {
+ actions_client_move(data, TRUE);
+ client_activate(data->client, o->here, FALSE, FALSE, TRUE);
+ actions_client_move(data, FALSE);
+ }
}
} else if (data->context == OB_FRAME_CONTEXT_DESKTOP) {
/* focus action on the root window. make keybindings work for this