From 3ab61505082f7d32a82e3b04d71f5d6dbb6a66dc Mon Sep 17 00:00:00 2001
From: Lior Halphon <LIJI32@gmail.com>
Date: Sun, 3 Sep 2023 16:46:00 +0300
Subject: [PATCH] Fixed weird printer related crashes on open, seems like an
 Apple regression?

---
 Cocoa/Document.m   | 11 ++++++++---
 Cocoa/Document.xib |  1 -
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Cocoa/Document.m b/Cocoa/Document.m
index ea6115c8b..03c2f0d58 100644
--- a/Cocoa/Document.m
+++ b/Cocoa/Document.m
@@ -783,13 +783,18 @@ static unsigned *multiplication_table_for_frequency(unsigned frequency)
     if (@available(macOS 11.0, *)) {
         self.memoryWindow.toolbarStyle = NSWindowToolbarStyleExpanded;
         self.printerFeedWindow.toolbarStyle = NSWindowToolbarStyleUnifiedCompact;
-        [self.printerFeedWindow.toolbar removeItemAtIndex:1];
-        self.printerFeedWindow.toolbar.items.firstObject.image =
+        self.printerFeedWindow.toolbar.items[0].image =
             [NSImage imageWithSystemSymbolName:@"square.and.arrow.down"
                       accessibilityDescription:@"Save"];
-        self.printerFeedWindow.toolbar.items.lastObject.image =
+        self.printerFeedWindow.toolbar.items[1].image =
             [NSImage imageWithSystemSymbolName:@"printer"
                       accessibilityDescription:@"Print"];
+        self.printerFeedWindow.toolbar.items[0].bordered = false;
+        self.printerFeedWindow.toolbar.items[1].bordered = false;
+    }
+    else {
+        [self.printerFeedWindow.toolbar insertItemWithItemIdentifier:NSToolbarFlexibleSpaceItemIdentifier
+                                                             atIndex:2];
     }
     
     
diff --git a/Cocoa/Document.xib b/Cocoa/Document.xib
index 355fb9fb6..c835d4448 100644
--- a/Cocoa/Document.xib
+++ b/Cocoa/Document.xib
@@ -708,7 +708,6 @@
                 <defaultToolbarItems>
                     <toolbarItem reference="CBz-1N-o0Q"/>
                     <toolbarItem reference="mtd-zS-DXa"/>
-                    <toolbarItem reference="Q0x-n5-Q2Y"/>
                     <toolbarItem reference="CJX-Ff-7iQ"/>
                 </defaultToolbarItems>
             </toolbar>