From 48c91efeaf0d5c5f96c7c450c13d9bb4b5b442b9 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 1 Dec 2018 10:07:17 +0100 Subject: [PATCH] update: fix commit 19108de408c25e2bda0586273d5645214769e7a7 (hopefully the last fix) Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/c298cf3e3842689063605c5b171012235cacc0a0 Author: vanhofen Date: 2018-12-01 (Sat, 01 Dec 2018) Origin message was: ------------------ - update: fix commit 19108de408c25e2bda0586273d5645214769e7a7 (hopefully the last fix) --- src/gui/update.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 84c2fa36f..2fef0f2d5 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -123,7 +123,7 @@ CFlashUpdate::CFlashUpdate() sysfs = MTD_DEVICE_OF_UPDATE_PART; dprintf(DEBUG_NORMAL, "[update] mtd partition to update: %s\n", sysfs.c_str()); notify = true; - gotImage = false; + gotImage = false; // NOTE: local update can't set gotImage variable! } @@ -583,7 +583,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) dprintf(DEBUG_NORMAL, "[update] flash/install filename %s type %c\n", filename.c_str(), fileType); - if (gotImage && (fileType <= '9')) // flashing image + if (fileType <= '9') // flashing image { #if ENABLE_EXTUPDATE #ifndef BOXMODEL_CS_HD2 @@ -617,7 +617,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) ft.reboot(); } #if HAVE_ARM_HARDWARE - else if (gotImage && (fileType == 'Z')) // flashing image with ofgwrite + else if (fileType == 'Z') // flashing image with ofgwrite { showGlobalStatus(100);