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
d737d568
Commit
d737d568
authored
Aug 10, 2012
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ml: correctly handle initdatabase failure
parent
b1b58e38
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
modules/media_library/sql_media_library.c
modules/media_library/sql_media_library.c
+1
-5
No files found.
modules/media_library/sql_media_library.c
View file @
d737d568
...
...
@@ -160,7 +160,7 @@ static int load( vlc_object_t *obj )
if
(
InitDatabase
(
p_ml
)
!=
VLC_SUCCESS
)
{
vlc_mutex_destroy
(
&
p_ml
->
p_sys
->
lock
);
//free( p_ml->p_sys ); // FIXME: Freed in InitDatase ?!?
free
(
p_ml
->
p_sys
);
return
VLC_EGENERIC
;
}
...
...
@@ -1064,11 +1064,7 @@ int InitDatabase( media_library_t *p_ml )
p_ml
->
p_sys
->
p_sql
=
sql_Create
(
p_ml
,
NULL
,
psz_dbhost
,
i_port
,
psz_user
,
psz_pass
);
if
(
!
p_ml
->
p_sys
->
p_sql
)
{
vlc_mutex_destroy
(
&
p_ml
->
p_sys
->
lock
);
free
(
p_ml
->
p_sys
);
return
VLC_EGENERIC
;
}
/* Let's check if tables exist */
int
i_version
=
GetDatabaseVersion
(
p_ml
);
...
...
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