Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
ae8b4b81
Commit
ae8b4b81
authored
Nov 16, 2011
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: preferences, fix conflict detection.
Should close #3823 and #5052
parent
b009862b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/gui/qt4/components/preferences_widgets.cpp
modules/gui/qt4/components/preferences_widgets.cpp
+6
-6
No files found.
modules/gui/qt4/components/preferences_widgets.cpp
View file @
ae8b4b81
...
...
@@ -1550,8 +1550,8 @@ void KeyInputDialog::checkForConflicts( int i_vlckey )
b_global
?
2
:
1
);
if
(
conflictList
.
count
()
&&
conflictList
[
0
]
->
data
(
b_global
?
2
:
1
,
Qt
::
UserRole
).
toInt
()
>
1
)
/* Avoid 0 or -1 that are the "Unset" states */
!
conflictList
[
0
]
->
data
(
b_global
?
2
:
1
,
Qt
::
UserRole
).
toString
().
isEmpty
()
&&
conflictList
[
0
]
->
data
(
b_global
?
2
:
1
,
Qt
::
UserRole
).
toString
()
!=
"Unset"
)
{
warning
->
setText
(
qtr
(
"Warning: the key is already assigned to
\"
"
)
+
conflictList
[
0
]
->
text
(
0
)
+
"
\"
"
);
...
...
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