From 4f2a24899ec16e3fdd974fbdb6e2e668fd10bf4a Mon Sep 17 00:00:00 2001 From: satbaby Date: Wed, 2 May 2012 19:41:24 +0200 Subject: [PATCH 1/4] pictureviewer.cpp: fix possible segfault --- src/gui/pictureviewer.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) 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) From 2ee9e7869f00b828bacf3825914aede2d5b05119 Mon Sep 17 00:00:00 2001 From: satbaby Date: Thu, 3 May 2012 10:41:21 +0200 Subject: [PATCH 2/4] satellites.xml: update Astra19 --- data/satellites.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/satellites.xml b/data/satellites.xml index 83b5dd895..1f9e0eb78 100755 --- a/data/satellites.xml +++ b/data/satellites.xml @@ -1575,18 +1575,23 @@ + + + + + @@ -1616,7 +1621,7 @@ - + From 674dd642c34a1dad28f35f018e7b6d5fb553c694 Mon Sep 17 00:00:00 2001 From: satbaby Date: Thu, 3 May 2012 10:56:00 +0200 Subject: [PATCH 3/4] satellites.xml: update Hotbird13 --- data/satellites.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/satellites.xml b/data/satellites.xml index 1f9e0eb78..da0d9bc18 100755 --- a/data/satellites.xml +++ b/data/satellites.xml @@ -1406,6 +1406,7 @@ + From 6248f1180749395bbf8356448290ca4434522e22 Mon Sep 17 00:00:00 2001 From: satbaby Date: Thu, 3 May 2012 12:01:17 +0200 Subject: [PATCH 4/4] moviebrowser.cpp:fix delete file --- src/gui/moviebrowser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);