diff options
author | Jay Freeman (saurik) <saurik@saurik.com> | 2016-12-30 14:11:05 -0800 |
---|---|---|
committer | Jay Freeman (saurik) <saurik@saurik.com> | 2016-12-30 14:11:05 -0800 |
commit | fec09a82a82c55ef19723940d96cb15e15fc4ed2 (patch) | |
tree | b5195b6779749edb39fb3bd70294deec414bcf28 /MobileCydia.mm | |
parent | f886c114ebd1027618550e23b2517876a1c20ef6 (diff) |
Provide more guarantees against merge catastrophe.v1.1.28%b4
Diffstat (limited to 'MobileCydia.mm')
-rw-r--r-- | MobileCydia.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MobileCydia.mm b/MobileCydia.mm index ce79ef7..32c0244 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -3869,7 +3869,7 @@ class CydiaLogCleaner : opened = cache_.Open(progress, false); _end if (!opened) { - // XXX: what if there are errors, but Open() == true? this should be merged with popError: + // XXX: this block should probably be merged with popError: in some way while (!_error->empty()) { std::string error; bool warning(!_error->PopMessage(error)); @@ -3897,7 +3897,8 @@ class CydiaLogCleaner : } return; - } + } else if ([self popErrorWithTitle:title forOperation:true]) + return; _trace(); unlink("/tmp/cydia.chk"); |