From 79f66537f0fe5fb9dafd729a597379daa21d23c3 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Mon, 25 May 2015 15:31:20 +0200 Subject: [PATCH] COPKGManager: remove useless err_msg var, replaced by tmp_str --- src/gui/opkg_manager.cpp | 3 +-- src/gui/opkg_manager.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/gui/opkg_manager.cpp b/src/gui/opkg_manager.cpp index b2d64438e..bdf2792d9 100644 --- a/src/gui/opkg_manager.cpp +++ b/src/gui/opkg_manager.cpp @@ -427,7 +427,7 @@ int COPKGManager::doUpdate() { int r = execCmd(pkg_types[OM_UPDATE]); if (r == -1) { - string msg = string(g_Locale->getText(LOCALE_OPKG_FAILURE_UPDATE)) + "\n" + err_msg; + string msg = string(g_Locale->getText(LOCALE_OPKG_FAILURE_UPDATE)); DisplayErrorMessage(msg.c_str()); return r; } @@ -675,7 +675,6 @@ int COPKGManager::execCmd(const char *cmdstr, bool verbose, bool acknowledge) int res = 0; has_err = false; tmp_str.clear(); - err_msg = ""; bool ok = true; if (verbose) { //create CShellWindow object diff --git a/src/gui/opkg_manager.h b/src/gui/opkg_manager.h index 6ef3fe83b..0403903db 100644 --- a/src/gui/opkg_manager.h +++ b/src/gui/opkg_manager.h @@ -96,7 +96,6 @@ class COPKGManager : public CMenuTarget err_list = errlist; }; void showErr(int* res); - std::string err_msg; int execCmd(const char* cmdstr, bool verbose = false, bool acknowledge = false); int execCmd(std::string cmdstr, bool verbose = false, bool acknowledge = false) {