From 9121f33bc84f35a3403c8caf028544dbe7e917c1 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 18 Jun 2013 16:22:34 +0400 Subject: [PATCH] gui/update.cpp: hide progress window, if applySettings() failed Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d7bdd4ee6e4b39946a603c7e406c1333a3c43b73 Author: [CST] Focus Date: 2013-06-18 (Tue, 18 Jun 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/update.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 692a21111..8e0ddfec7 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -465,8 +465,10 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) //flash it... if (g_settings.apply_settings) { if (ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_APPLY_SETTINGS), CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NEUTRINO_ICON_UPDATE) == CMessageBox::mbrYes) - if (!CExtUpdate::getInstance()->applySettings(filename, CExtUpdate::MODE_SOFTUPDATE)) + if (!CExtUpdate::getInstance()->applySettings(filename, CExtUpdate::MODE_SOFTUPDATE)) { + hide(); return menu_return::RETURN_REPAINT; + } } #ifdef DEBUG1