diff --git a/src/gui/opkg_manager.cpp b/src/gui/opkg_manager.cpp index 7a347bb10..b2d64438e 100644 --- a/src/gui/opkg_manager.cpp +++ b/src/gui/opkg_manager.cpp @@ -797,12 +797,13 @@ void COPKGManager::showErr(int* res) DisplayErrorMessage(errtest.c_str()); } -void COPKGManager::showError(const char* local_msg, char* err_message, const string& command) +void COPKGManager::showError(const char* local_msg, char* err_message, const string& additional_text) { string msg = local_msg ? string(local_msg) + "\n" : ""; - msg += err_msg + "\n"; - msg += string(err_message) + ":\n"; - msg += command; + if (err_message) + msg += string(err_message) + ":\n"; + if (!additional_text.empty()) + msg += additional_text; DisplayErrorMessage(msg.c_str()); } diff --git a/src/gui/opkg_manager.h b/src/gui/opkg_manager.h index 2d5faaa07..6ef3fe83b 100644 --- a/src/gui/opkg_manager.h +++ b/src/gui/opkg_manager.h @@ -126,7 +126,7 @@ class COPKGManager : public CMenuTarget void updateMenu(); void refreshMenu(); bool badpackage(std::string &s); - void showError(const char* local_msg, char* err_msg, const std::string& command); + void showError(const char* local_msg, char* err_msg = NULL, const std::string& additional_text = std::string()); int doUpdate(); void handleShellOutput(std::string* cur_line, int* res, bool* ok);