Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit b3f47fa
Merge: a90d196 b019f69
Author: Balazs Perlaki-Horvath <[email protected]>
Date:   Sun Apr 14 17:35:12 2024 +0200

    Merge branch '622-corrupted-zim-leads-to-crash' of github.com:kiwix/apple into 622-corrupted-zim-leads-to-crash

commit a90d196
Author: Balazs Perlaki-Horvath <[email protected]>
Date:   Tue Apr 9 21:31:22 2024 +0200

    Update try catch

commit b784b27
Author: Balazs Perlaki-Horvath <[email protected]>
Date:   Tue Apr 9 13:19:11 2024 +0200

    Wrap search in standard exception handling

commit b019f69
Merge: d6e8e9a 8541cde
Author: Balazs Perlaki-Horvath <[email protected]>
Date:   Tue Apr 9 23:54:53 2024 +0200

    Merge branch '622-corrupted-zim-leads-to-crash' of github.com:kiwix/apple into 622-corrupted-zim-leads-to-crash

commit d6e8e9a
Author: Balazs Perlaki-Horvath <[email protected]>
Date:   Tue Apr 9 21:31:22 2024 +0200

    Update try catch

commit c132912
Author: Balazs Perlaki-Horvath <[email protected]>
Date:   Tue Apr 9 13:19:11 2024 +0200

    Wrap search in standard exception handling

commit 8541cde
Author: Balazs Perlaki-Horvath <[email protected]>
Date:   Tue Apr 9 13:19:11 2024 +0200

    Wrap search in standard exception handling

commit 57e008e
Merge: 5024548 4459187
Author: Balazs Perlaki-Horvath <[email protected]>
Date:   Tue Apr 9 13:02:15 2024 +0200

    Merge branch '622-corrupted-zim-leads-to-crash' of github.com:kiwix/apple into 622-corrupted-zim-leads-to-crash

commit 4459187
Author: Balazs Perlaki-Horvath <[email protected]>
Date:   Mon Apr 8 08:39:00 2024 +0200

    Fix unlinked ZIM file tab state
  • Loading branch information
BPerlakiH committed Apr 14, 2024
1 parent f8a5a26 commit 7ac2e31
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions SwiftUI/Model/SearchOperation/SearchOperation.mm
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ - (void)performSearch {
// get a list of archives that are included in search
typedef std::unordered_map<std::string, zim::Archive> archives_map;
auto *allArchives = static_cast<archives_map *>([[ZimFileService sharedInstance] getArchives]);

std::vector<zim::Archive> indexSearchArchives = std::vector<zim::Archive>();
std::vector<zim::Archive> titleSearchArchives = std::vector<zim::Archive>();
for (NSUUID *zimFileID in self.zimFileIDs) {
Expand All @@ -63,9 +63,9 @@ - (void)performSearch {
indexSearchArchives.push_back(archive);
}
titleSearchArchives.push_back(archive);
} catch (std::out_of_range) { }
} catch (std::exception) { }
}

// perform index and title search
[self addIndexSearchResults:indexSearchArchives];
if (titleSearchArchives.size() > 0) {
Expand Down

0 comments on commit 7ac2e31

Please sign in to comment.