From 6fdcfe454e03a7bb05fca7e7575647135a8240e4 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran0@users.noreply.github.com>
Date: Thu, 8 Aug 2024 13:52:54 +0700
Subject: [PATCH] Fix a ldid assertion & some changes

---
 LCMachOUtils.m       | 4 +++-
 LCUtils.m            | 5 +++++
 README.md            | 2 +-
 Resources/Root.plist | 8 ++++----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/LCMachOUtils.m b/LCMachOUtils.m
index 65eb873..f1fb327 100644
--- a/LCMachOUtils.m
+++ b/LCMachOUtils.m
@@ -103,8 +103,10 @@ void LCPatchExecSlice(const char *path, struct mach_header_64 *header) {
         }
     } else if (magic == MH_MAGIC_64) {
         callback(path, (struct mach_header_64 *)map);
-    } else {
+    } else if (magic == MH_MAGIC) {
         return @"32-bit app is not supported";
+    } else {
+        //return @"Not a Mach-O file";
     }
 
     msync(map, s.st_size, MS_SYNC);
diff --git a/LCUtils.m b/LCUtils.m
index f671777..fc818ee 100644
--- a/LCUtils.m
+++ b/LCUtils.m
@@ -90,6 +90,11 @@ + (BOOL)launchToGuestAppWithURL:(NSURL *)url {
 #pragma mark Code signing
 
 + (void)loadStoreFrameworksWithError:(NSError **)error {
+    // too lazy to use dispatch_once
+    static BOOL loaded = NO;
+    if (loaded) return;
+    loaded = YES;
+
     NSArray *signerFrameworks = @[@"OpenSSL.framework", @"Roxas.framework", @"AltStoreCore.framework"];
     NSURL *storeFrameworksPath = [self.storeBundlePath URLByAppendingPathComponent:@"Frameworks"];
     for (NSString *framework in signerFrameworks) {
diff --git a/README.md b/README.md
index e42ba13..d3a9373 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ To install tweaks, you can use the built-in tweak manager in LiveContainer, whic
 
 ## TODO
 - Isolate Keychain per app
-- Use Ch0ma instead of custom MachO parser
+- Use ChOma instead of custom MachO parser
 
 ## License
 [Apache License 2.0](https://github.com/khanhduytran0/LiveContainer/blob/main/LICENSE)
diff --git a/Resources/Root.plist b/Resources/Root.plist
index aa18b76..072a8be 100644
--- a/Resources/Root.plist
+++ b/Resources/Root.plist
@@ -43,10 +43,10 @@
 		<dict>
 			<key>cell</key>
 			<string>PSGroupCell</string>
-			<key>label</key>
-			<string>Miscellaneous</string>
 			<key>footerText</key>
 			<string>Frame shortcut icons with LiveContainer icon.</string>
+			<key>label</key>
+			<string>Miscellaneous</string>
 		</dict>
 		<dict>
 			<key>cell</key>
@@ -81,10 +81,10 @@
 		<dict>
 			<key>cell</key>
 			<string>PSGroupCell</string>
+			<key>footerText</key>
+			<string>Please don’t use LiveContainer for piracy.</string>
 			<key>label</key>
 			<string>About me</string>
-			<key>footerText</key>
-			<string>Don't use LiveContainer for piracy.</string>
 		</dict>
 		<dict>
 			<key>action</key>