Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Casanowow Life for love
VLC-Android
Commits
3cfbe5d2
Commit
3cfbe5d2
authored
Apr 10, 2017
by
Geoffrey Métais
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Playlist creation can fail
parent
ec52a521
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
medialibrary/jni/medialibrary.cpp
medialibrary/jni/medialibrary.cpp
+2
-4
vlc-android/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.java
.../src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.java
+2
-0
No files found.
medialibrary/jni/medialibrary.cpp
View file @
3cfbe5d2
...
...
@@ -496,9 +496,7 @@ getPlaylist(JNIEnv* env, jobject thiz, jlong id)
{
AndroidMediaLibrary
*
aml
=
MediaLibrary_getInstance
(
env
,
thiz
);
medialibrary
::
PlaylistPtr
playlist
=
aml
->
playlist
(
id
);
if
(
playlist
!=
nullptr
)
return
convertPlaylistObject
(
env
,
&
ml_fields
,
playlist
);
return
nullptr
;
return
playlist
!=
nullptr
?
convertPlaylistObject
(
env
,
&
ml_fields
,
playlist
)
:
nullptr
;
}
jobject
...
...
@@ -508,7 +506,7 @@ playlistCreate(JNIEnv* env, jobject thiz, jstring name)
const
char
*
name_cstr
=
env
->
GetStringUTFChars
(
name
,
JNI_FALSE
);
medialibrary
::
PlaylistPtr
playlist
=
aml
->
PlaylistCreate
(
name_cstr
);
env
->
ReleaseStringUTFChars
(
name
,
name_cstr
);
return
convertPlaylistObject
(
env
,
&
ml_fields
,
playlist
);
return
playlist
!=
nullptr
?
convertPlaylistObject
(
env
,
&
ml_fields
,
playlist
)
:
nullptr
;
}
/*
...
...
vlc-android/src/org/videolan/vlc/gui/dialogs/SavePlaylistDialog.java
View file @
3cfbe5d2
...
...
@@ -148,6 +148,8 @@ public class SavePlaylistDialog extends DialogFragment implements View.OnClickLi
MediaWrapper
[]
tracks
;
if
(!
exists
)
playlist
=
mMedialibrary
.
createPlaylist
(
name
);
if
(
playlist
==
null
)
return
;
if
(
addTracks
)
{
tracks
=
mNewTrack
;
}
else
{
//Save a playlist
...
...
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