mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Lightly tested only...
This commit is contained in:
Stefan Seyfried
2013-12-25 22:51:23 +01:00
parent 164ab9ab42 bc8b81a190
commit cdd065fc2e
90 changed files with 1583 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/pictureviewer.cpp
View File

@@ -98,10 +98,10 @@ CPictureViewerGui::CPictureViewerGui()
selected = 0;
m_sort = FILENAME;
m_viewer = new CPictureViewer();
if (strlen(g_settings.network_nfs_picturedir)!=0)
Path = g_settings.network_nfs_picturedir;
else
if (g_settings.network_nfs_picturedir.empty())
Path = "/";
else
Path = g_settings.network_nfs_picturedir;
picture_filter.addFilter("png");
picture_filter.addFilter("bmp");
@@ -275,7 +275,7 @@ int CPictureViewerGui::show()
timeout=50; // egal
else
{
timeout=(m_time+atoi(g_settings.picviewer_slide_time)-(long)time(NULL))*10;
timeout=(m_time+g_settings.picviewer_slide_time-(long)time(NULL))*10;
if (timeout <0 )
timeout=1;
}
@@ -427,7 +427,7 @@ int CPictureViewerGui::show()
{
if (m_state == MENU)
{
CFileBrowser filebrowser((g_settings.filebrowser_denydirectoryleave) ? g_settings.network_nfs_picturedir : "");
CFileBrowser filebrowser((g_settings.filebrowser_denydirectoryleave) ? g_settings.network_nfs_picturedir.c_str() : "");
filebrowser.Multi_Select = true;
filebrowser.Dirs_Selectable = true;