Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
15b1a1b9
Commit
15b1a1b9
authored
Apr 17, 2012
by
Erwan Tulou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
skins2: fix vlc sometimes crashing with drag'n'drop.
This fixes #6599
parent
733ee4f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
1 deletion
+16
-1
modules/gui/skins2/controls/ctrl_tree.cpp
modules/gui/skins2/controls/ctrl_tree.cpp
+2
-1
modules/gui/skins2/vars/playtree.cpp
modules/gui/skins2/vars/playtree.cpp
+14
-0
No files found.
modules/gui/skins2/controls/ctrl_tree.cpp
View file @
15b1a1b9
...
...
@@ -513,7 +513,8 @@ void CtrlTree::handleEvent( EvtGeneric &rEvent )
{
EvtDragDrop
&
evt
=
static_cast
<
EvtDragDrop
&>
(
rEvent
);
Playtree
&
rPlaytree
=
static_cast
<
Playtree
&>
(
m_rTree
);
rPlaytree
.
insertItems
(
*
m_itOver
,
evt
.
getFiles
(),
false
);
VarTree
&
item
=
(
m_itOver
!=
m_rTree
.
end
()
)
?
*
m_itOver
:
m_rTree
;
rPlaytree
.
insertItems
(
item
,
evt
.
getFiles
(),
false
);
m_itOver
=
m_rTree
.
end
();
needRefresh
=
true
;
}
...
...
modules/gui/skins2/vars/playtree.cpp
View file @
15b1a1b9
...
...
@@ -283,15 +283,29 @@ void Playtree::insertItems( VarTree& elem, const list<string>& files, bool start
playlist_Lock
(
m_pPlaylist
);
if
(
p_elem
==
this
)
{
for
(
Iterator
it
=
m_children
.
begin
();
it
!=
m_children
.
end
();
++
it
)
{
if
(
it
->
getId
()
==
m_pPlaylist
->
p_local_category
->
i_id
)
{
p_elem
=
&*
it
;
break
;
}
}
}
if
(
p_elem
->
getId
()
==
m_pPlaylist
->
p_local_category
->
i_id
)
{
p_node
=
m_pPlaylist
->
p_local_category
;
i_pos
=
0
;
p_elem
->
setExpanded
(
true
);
}
else
if
(
p_elem
->
getId
()
==
m_pPlaylist
->
p_ml_category
->
i_id
)
{
p_node
=
m_pPlaylist
->
p_ml_category
;
i_pos
=
0
;
p_elem
->
setExpanded
(
true
);
}
else
if
(
p_elem
->
size
()
&&
p_elem
->
isExpanded
()
)
{
...
...
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