diff --git a/data/satellites.xml b/data/satellites.xml index 83b5dd895..da0d9bc18 100755 --- a/data/satellites.xml +++ b/data/satellites.xml @@ -1406,6 +1406,7 @@ + @@ -1575,18 +1576,23 @@ + + + + + @@ -1616,7 +1622,7 @@ - + diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index d66a2a424..903f99b37 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -2575,7 +2575,7 @@ bool CMovieBrowser::delFile_std(CFile& file) { bool result = true; char buf[FILENAME_MAX]={0}; - snprintf(buf,sizeof(buf), "nice -n 20 rm -f %s &", file.Name.c_str()); + snprintf(buf,sizeof(buf), "nice -n 20 rm -f \"%s\" &", file.Name.c_str()); system(buf); TRACE(" delete file: %s\r\n",file.Name.c_str()); return(result); diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp index 700f076e8..151f1520e 100644 --- a/src/gui/pictureviewer.cpp +++ b/src/gui/pictureviewer.cpp @@ -430,16 +430,19 @@ int CPictureViewerGui::show() } else if (msg==CRCInput::RC_blue) { - if ((m_state == MENU) && (!playlist.empty())) + if(!playlist.empty()) { - m_time=(long)time(NULL); - view(selected); - m_state=SLIDESHOW; - } else { - if (m_state == SLIDESHOW) - m_state = VIEW; - else - m_state = SLIDESHOW; + if (m_state == MENU) + { + m_time=(long)time(NULL); + view(selected); + m_state=SLIDESHOW; + } else { + if (m_state == SLIDESHOW) + m_state = VIEW; + else + m_state = SLIDESHOW; + } } } else if (msg==CRCInput::RC_help)