Commit 5dfdcf24 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

QT4: fix warning on already assigned hotkey

Patch by  Hannes Domani
parent 13817879
......@@ -998,6 +998,8 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem )
QTreeWidgetItem *it = table->topLevelItem(i);
module_config_t *p_item = static_cast<module_config_t*>
(it->data( 0, Qt::UserRole ).value<void*>());
if( p_keyItem != p_item && p_item->value.i == d->keyValue )
p_item->value.i = 0;
it->setText( 1, VLCKeyToString( p_item->value.i ) );
}
}
......@@ -1052,7 +1054,6 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
if( p_current->value.i == i_vlckey && strcmp( p_current->psz_text,
keyToChange ) )
{
p_current->value.i = 0;
conflicts = true;
break;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment