Merge branch 'develop_PDFReaderProNew' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderProNew

PDF Office/PDF Master/Class/PDFTools/Compare/KMCompareWindowController.swift

@@ -59,6 +59,7 @@ class KMCompareWindowController: KMBaseWindowController {
     }
     
     func compareAction(config: KMCompareFilesConfig) {
+        compareView.doneButton.isEnabled = false
 
         guard let pdfOldDocument = config.fileOldAttribute.pdfDocument, let pdfNewDocument = config.fileNewAttribute.pdfDocument else {
             let alert = NSAlert()
@@ -210,7 +211,7 @@ class KMCompareWindowController: KMBaseWindowController {
 //                    }
                 }
                 
-//                DispatchQueue.main.async {
+                DispatchQueue.main.async {
                     self.contentComplete?(self, pdfCompareContent!, results, oldDoc!, doc!)
                     if results.count > 0 {
                         // Handle success case
@@ -220,7 +221,7 @@ class KMCompareWindowController: KMBaseWindowController {
                         alert.messageText = NSLocalizedString("There is no difference between the two documents.", comment: "")
                         alert.runModal()
                     }
-//                }
+                }
             }
         }
 

PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController+Action.swift

@@ -4373,16 +4373,14 @@ extension KMMainViewController : KMMainToolbarControllerDelegate {
                 }
                 
                 controller.contentComplete = { [unowned self] controller, pdfCompareContent, result, oldDocument, document in
-                    DispatchQueue.main.async {
-                        self.view.window?.endSheet((controller.window)!)
-                        self.currentWindowController = nil
-                        
-                        self.openContentCompareVC(with: pdfCompareContent, results: result, oldDocument: oldDocument, document: document)
-                    }
+                    self.view.window?.endSheet((self.currentWindowController.window)!)
+                    self.currentWindowController = nil
+                    
+                    self.openContentCompareVC(with: pdfCompareContent, results: result, oldDocument: oldDocument, document: document)
                 }
                 
                 controller.coveringComplete = { [unowned self] controller, document in
-                    self.view.window?.endSheet((controller.window)!)
+                    self.view.window?.endSheet((self.currentWindowController.window)!)
                     self.currentWindowController = nil
                     
                     self.openCoveringCompareVC(with: document)