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
9e76fdbc
Commit
9e76fdbc
authored
Aug 30, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Skins2: blind attempt to fix a ThemeRepository crash
Top crash on Skins2 module on Win32
parent
ec7e4d53
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
modules/gui/skins2/src/theme_repository.cpp
modules/gui/skins2/src/theme_repository.cpp
+5
-1
No files found.
modules/gui/skins2/src/theme_repository.cpp
View file @
9e76fdbc
...
@@ -73,6 +73,7 @@ ThemeRepository::ThemeRepository( intf_thread_t *pIntf ): SkinObject( pIntf )
...
@@ -73,6 +73,7 @@ ThemeRepository::ThemeRepository( intf_thread_t *pIntf ): SkinObject( pIntf )
// retrieve skins from skins directories and locate default skins
// retrieve skins from skins directories and locate default skins
map
<
string
,
string
>::
const_iterator
itmap
,
itdefault
;
map
<
string
,
string
>::
const_iterator
itmap
,
itdefault
;
bool
b_default_found
=
false
;
for
(
itmap
=
m_skinsMap
.
begin
();
itmap
!=
m_skinsMap
.
end
();
++
itmap
)
for
(
itmap
=
m_skinsMap
.
begin
();
itmap
!=
m_skinsMap
.
end
();
++
itmap
)
{
{
string
name
=
itmap
->
first
;
string
name
=
itmap
->
first
;
...
@@ -83,7 +84,10 @@ ThemeRepository::ThemeRepository( intf_thread_t *pIntf ): SkinObject( pIntf )
...
@@ -83,7 +84,10 @@ ThemeRepository::ThemeRepository( intf_thread_t *pIntf ): SkinObject( pIntf )
&
text
);
&
text
);
if
(
name
==
"Default"
)
if
(
name
==
"Default"
)
{
itdefault
=
itmap
;
itdefault
=
itmap
;
b_default_found
=
true
;
}
}
}
// retrieve last skins stored or skins requested by user
// retrieve last skins stored or skins requested by user
...
@@ -98,7 +102,7 @@ ThemeRepository::ThemeRepository( intf_thread_t *pIntf ): SkinObject( pIntf )
...
@@ -98,7 +102,7 @@ ThemeRepository::ThemeRepository( intf_thread_t *pIntf ): SkinObject( pIntf )
current
.
c_str
(),
b_readable
?
""
:
"NOT"
);
current
.
c_str
(),
b_readable
?
""
:
"NOT"
);
// set the default skins if given skins not accessible
// set the default skins if given skins not accessible
if
(
!
b_readable
)
if
(
!
b_readable
&&
b_default_found
)
current
=
itdefault
->
second
;
current
=
itdefault
->
second
;
// save this valid skins for reuse
// save this valid skins for reuse
...
...
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