Browse Source

【综合】偶发crash修复

tangchao 6 tháng trước cách đây
mục cha
commit
ae73849033

+ 1 - 1
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+UI.swift

@@ -825,7 +825,7 @@ extension KMMainViewController {
         //阅读界面初始化
         //阅读界面初始化
         self.readModelView.isHidden = false
         self.readModelView.isHidden = false
         self.readModelView.currentPageIndex = self.listView.currentPageIndex
         self.readModelView.currentPageIndex = self.listView.currentPageIndex
-        self.readModelView.totalPagesCount = Int(self.listView.document.pageCount)
+        self.readModelView.totalPagesCount = Int(self.listView?.document?.pageCount ?? 0)
         self.readModelView.beginTimer()
         self.readModelView.beginTimer()
 //        self.listView.autoScales = true
 //        self.listView.autoScales = true
 //        self.readModelView.scaleType = .autoSize
 //        self.readModelView.scaleType = .autoSize

+ 5 - 5
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -481,11 +481,6 @@ import Cocoa
                 self.showSnapshots(setups: snapshotSetups)
                 self.showSnapshots(setups: snapshotSetups)
             }
             }
         }
         }
-        
-        let readModel = UserDefaults.standard.bool(forKey: "kKMPDFViewIsReadMode")
-        if readModel == true {
-            self.openReadModel()
-        }
 
 
         let hasWindowSetup = savedNormalSetup.count > 0
         let hasWindowSetup = savedNormalSetup.count > 0
         if UserDefaults.standard.dictionary(forKey: KMDefaultPDFDisplaySettingsKey) != nil {
         if UserDefaults.standard.dictionary(forKey: KMDefaultPDFDisplaySettingsKey) != nil {
@@ -2154,6 +2149,11 @@ import Cocoa
             self.showSecureLimitTip()
             self.showSecureLimitTip()
         }
         }
         
         
+        let readModel = UserDefaults.standard.bool(forKey: "kKMPDFViewIsReadMode")
+        if readModel == true {
+            self.openReadModel()
+        }
+        
         if self.model.needConvertNotes {
         if self.model.needConvertNotes {
             self.showConvertNotesProgress()
             self.showConvertNotesProgress()
         }
         }