mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/update.cpp: return result from file browser or image select menu

Browse Source
This commit is contained in:
[CST] Focus
2012-11-16 16:49:58 +04:00
parent 0f8c9bbef1
commit 76947173c0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/update.cpp
View File

@@ -243,7 +243,7 @@ bool CFlashUpdate::selectHttpImage(void)
else
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_NEW_NOTFOUND), CMessageBox::mbrOk, CMessageBox::mbOk, NEUTRINO_ICON_INFO);
SelectionWidget.exec(NULL, "");
menu_ret = SelectionWidget.exec(NULL, "");
for (std::vector<CUpdateMenuTarget*>::iterator it = update_t_list.begin(); it != update_t_list.end(); ++it)
delete (*it);
@@ -343,8 +343,10 @@ printf("[update] mode is %d\n", g_settings.softupdate_mode);
UpdatesBrowser.Filter = &UpdatesFilter;
CFile * CFileSelected = NULL;
if (!(UpdatesBrowser.exec(g_settings.update_dir)))
if (!(UpdatesBrowser.exec(g_settings.update_dir))) {
menu_ret = UpdatesBrowser.getMenuRet();
return false;
}
CFileSelected = UpdatesBrowser.getSelectedFile();
@@ -386,6 +388,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
if(parent)
parent->hide();
menu_ret = menu_return::RETURN_REPAINT;
paint();
if(sysfs.size() < 8) {
@@ -395,7 +398,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &)
}
if(!checkVersion4Update()) {
hide();
return menu_return::RETURN_REPAINT;
return menu_ret; //menu_return::RETURN_REPAINT;
}
#ifdef VFD_UPDATE