mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-13 00:13:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino remove useless allow_flash from CmdParser()

Browse Source 
Origin commit data
------------------
Commit: 6981a252c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2024-01-05 (Fri, 05 Jan 2024)

Origin message was:
------------------
- neutrino remove useless allow_flash from CmdParser()

------------------
No further description and justification available within origin commit message!
This commit is contained in:
vanhofen
2024-01-05 23:02:50 +01:00
committed by Thilo Graf
parent 18f390f2e8
commit 947b52f09a
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/update.cpp
View File

@@ -83,8 +83,6 @@ extern cVideo *videoDecoder;
#include <sys/stat.h>
extern int allow_flash;
//#define DRYRUN
#define gTmpPath "/tmp/"
@@ -302,7 +300,7 @@ bool CFlashUpdate::selectHttpImage(void)
dprintf(DEBUG_NORMAL, "[update] url %s version %s (%d) timestamp %s (%ld) md5 %s name %s\n", url.c_str(), version.c_str(), newVer, versionInfo.getDate(), versionInfo.getDateTime(), md5.c_str(), name.c_str());
if (versionInfo.snapshot <= '2' && (newVer > curVer || versionInfo.getDateTime() > curInfo.getDateTime()))
newfound = 1;
if (!allow_flash && (versionInfo.snapshot <= '2'))
if (versionInfo.snapshot <= '2')
enabled = false;
fileTypes[i] = versionInfo.snapshot;
std::string description = versionInfo.getType(true);
@@ -444,13 +442,11 @@ bool CFlashUpdate::checkVersion4Update()
CFileBrowser UpdatesBrowser;
CFileFilter UpdatesFilter;
if (allow_flash)
{
UpdatesFilter.addFilter(FILEBROWSER_UPDATE_FILTER);
UpdatesFilter.addFilter(FILEBROWSER_UPDATE_FILTER);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
UpdatesFilter.addFilter("zip");
UpdatesFilter.addFilter("zip");
#endif
}
std::string filters[] = {"bin", "txt"};
for (size_t i = 0; i < sizeof(filters) / sizeof(filters[0]) ; i++)
UpdatesFilter.addFilter(filters[i]);
@@ -496,8 +492,6 @@ bool CFlashUpdate::checkVersion4Update()
fileType = 'Z';
else if (!strcmp(ptr, "zip"))
fileType = 'Z';
else if (!allow_flash)
return false;
else
fileType = 0;
dprintf(DEBUG_NORMAL, "[update] manual file type: %s %c\n", ptr, fileType);