Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-06-26 22:22:07 +02:00
10 changed files with 16 additions and 9 deletions

View File

@@ -2480,7 +2480,7 @@ bool CMovieBrowser::onDelete(bool cursor_only)
MI_MOVIE_INFO *movieinfo;
movieinfo = NULL;
if (cursor_only)
if (cursor_only || (filelist.empty() || movielist.empty()))
{
filelist.clear();
movielist.clear();