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

- update: show some usefull osd-output while updating hd51

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-01-06 00:06:40 +01:00
committed by Thilo Graf
parent 0c5f53f016
commit 8329fe4b31
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/update.cpp
View File

@@ -454,14 +454,7 @@ bool CFlashUpdate::checkVersion4Update()
//!always leave here! //!always leave here!
return false; return false;
} }
#if HAVE_ARM_HARDWARE
//tgz package install:
else if (file_selected->getType() == CFile::FILE_TGZ_PACKAGE){
fileType = 'Z';
//!always leave here!
return true;
}
#endif
//set internal filetype //set internal filetype
char const * ptr = rindex(filename.c_str(), '.'); char const * ptr = rindex(filename.c_str(), '.');
if(ptr) { if(ptr) {
@@ -470,6 +463,8 @@ bool CFlashUpdate::checkVersion4Update()
fileType = 'A'; fileType = 'A';
else if(!strcmp(ptr, "txt")) else if(!strcmp(ptr, "txt"))
fileType = 'T'; fileType = 'T';
else if(!strcmp(ptr, "tgz"))
fileType = 'Z';
else if(!allow_flash) else if(!allow_flash)
return false; return false;
else else
@@ -542,7 +537,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;
} }
if(softupdate_mode==1) { //internet-update if(softupdate_mode==1) { //internet-update
if ( ShowMsg(LOCALE_MESSAGEBOX_INFO, (fileType <= '2') ? LOCALE_FLASHUPDATE_INSTALL_IMAGE : LOCALE_FLASHUPDATE_INSTALL_PACKAGE, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) != CMsgBox::mbrYes) if ( ShowMsg(LOCALE_MESSAGEBOX_INFO, ((fileType <= '2') || (fileType == 'Z')) ? LOCALE_FLASHUPDATE_INSTALL_IMAGE : LOCALE_FLASHUPDATE_INSTALL_PACKAGE, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) != CMsgBox::mbrYes)
{ {
hide(); hide();
return menu_return::RETURN_REPAINT; return menu_return::RETURN_REPAINT;