diff options
| author |  waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
| commit | ce2923c8f0cac7a563d1ecf22085ac62281c74d7 (patch) | |
| tree | 20ce1a2fd0cebc36231882b011e34230778a1db9 /plugins/gtkui/fileman.c | |
| parent | 527ba48d8209a8e854c791d571106a5daf2fdd29 (diff) | |
| parent | 708c8ba9f7aefe9f795c9c4eb30ab128f09c8b3d (diff) | |
Merge branch 'master' into devel
Conflicts:
README
configure.ac
deadbeef.h
plugins.c
plugins/gtkui/Makefile.am
plugins/gtkui/ddbcellrenderertextmultiline.c
plugins/gtkui/ddblistview.c
plugins/gtkui/deadbeef.glade
plugins/gtkui/gtkui.c
plugins/gtkui/interface.c
plugins/gtkui/plcommon.c
plugins/shellexec/shellexec.c
plugins/supereq/Makefile.am
Diffstat (limited to 'plugins/gtkui/fileman.c')
| -rw-r--r-- | plugins/gtkui/fileman.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/gtkui/fileman.c b/plugins/gtkui/fileman.c index 69f016af..72a5dfa8 100644 --- a/plugins/gtkui/fileman.c +++ b/plugins/gtkui/fileman.c @@ -27,6 +27,7 @@ gtkpl_adddir_cb (gpointer data, gpointer userdata) { void gtkpl_add_dirs (GSList *lst) { ddb_playlist_t *plt = deadbeef->plt_get_curr (); + int empty = 0 == deadbeef->plt_get_item_count (plt, PL_MAIN); if (deadbeef->pl_add_files_begin (plt) < 0) { deadbeef->plt_unref (plt); g_slist_free (lst); @@ -38,7 +39,7 @@ gtkpl_add_dirs (GSList *lst) { char t[1000]; if (!deadbeef->plt_get_title (plt, t, sizeof (t))) { char *def = _("New Playlist"); - if (!strncmp (t, def, strlen (def))) { + if (!strncmp (t, def, strlen (def)) || empty) { const char *folder = strrchr ((char*)lst->data, '/'); if (!folder) { folder = lst->data; |