Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into valgrind

This commit is contained in:
[CST] Focus
2012-05-03 16:03:18 +04:00
3 changed files with 20 additions and 11 deletions

View File

@@ -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);

View File

@@ -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)