From cb6e2ccf1e636ee709c709d68b379efe14540303 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Mon, 21 Feb 2011 06:47:26 -0800 Subject: Commit separate errors during popErrorWithTitle:. --- MobileCydia.mm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index 2b8c772..888c43e 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -3388,29 +3388,25 @@ static NSString *Warning_; - (bool) popErrorWithTitle:(NSString *)title { bool fatal(false); - std::string message; while (!_error->empty()) { std::string error; bool warning(!_error->PopMessage(error)); if (!warning) fatal = true; + for (;;) { size_t size(error.size()); if (size == 0 || error[size - 1] != '\n') break; error.resize(size - 1); } + lprintf("%c:[%s]\n", warning ? 'W' : 'E', error.c_str()); - if (!message.empty()) - message += "\n\n"; - message += error; + [delegate_ _setProgressError:[NSString stringWithUTF8String:error.c_str()] withTitle:[NSString stringWithFormat:Colon_, (warning ? Warning_ : Error_), title]]; } - if (fatal && !message.empty()) - [delegate_ _setProgressError:[NSString stringWithUTF8String:message.c_str()] withTitle:[NSString stringWithFormat:Colon_, fatal ? Error_ : Warning_, title]]; - return fatal; } -- cgit v1.2.3