Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
5dfdcf24
Commit
5dfdcf24
authored
Sep 08, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QT4: fix warning on already assigned hotkey
Patch by Hannes Domani
parent
13817879
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
modules/gui/qt4/components/preferences_widgets.cpp
modules/gui/qt4/components/preferences_widgets.cpp
+2
-1
No files found.
modules/gui/qt4/components/preferences_widgets.cpp
View file @
5dfdcf24
...
@@ -998,6 +998,8 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem )
...
@@ -998,6 +998,8 @@ void KeySelectorControl::selectKey( QTreeWidgetItem *keyItem )
QTreeWidgetItem
*
it
=
table
->
topLevelItem
(
i
);
QTreeWidgetItem
*
it
=
table
->
topLevelItem
(
i
);
module_config_t
*
p_item
=
static_cast
<
module_config_t
*>
module_config_t
*
p_item
=
static_cast
<
module_config_t
*>
(
it
->
data
(
0
,
Qt
::
UserRole
).
value
<
void
*>
());
(
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
)
);
it
->
setText
(
1
,
VLCKeyToString
(
p_item
->
value
.
i
)
);
}
}
}
}
...
@@ -1052,7 +1054,6 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
...
@@ -1052,7 +1054,6 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
if
(
p_current
->
value
.
i
==
i_vlckey
&&
strcmp
(
p_current
->
psz_text
,
if
(
p_current
->
value
.
i
==
i_vlckey
&&
strcmp
(
p_current
->
psz_text
,
keyToChange
)
)
keyToChange
)
)
{
{
p_current
->
value
.
i
=
0
;
conflicts
=
true
;
conflicts
=
true
;
break
;
break
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment