【内容编辑】图片进入裁剪模式按esc退出后，再次右键图片，菜单仍然显示裁剪模式的菜单

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

@@ -1229,12 +1229,13 @@ import Cocoa
                                     textItem?.isSelected = false
                                     imageItem?.isSelected = false
                                 }
-                                self!.rightSideViewController.isHidden = true
-                                self!.listView.endEditIsRemoveBlock(with: self!.listView.editingAreas().first as? CPDFEditArea)
-                                self!.listView.updateEditing([])
-                                self!.listView.setNeedsDisplayPageViewFor(self!.listView.currentPage())
-                                self!.closeRightPane()
-                            } else if(self!.listView.annotationType == .addImage || self!.listView.annotationType == .addText) {
+                                self?.rightSideViewController.isHidden = true
+                                self?.listView.endEditIsRemoveBlock(with: self!.listView.editingAreas().first as? CPDFEditArea)
+                                self?.listView.updateEditing([])
+                                self?.listView.isEditImage = false
+                                self?.listView.setNeedsDisplayPageViewFor(self!.listView.currentPage())
+                                self?.closeRightPane()
+                            } else if(self?.listView.annotationType == .addImage || self!.listView.annotationType == .addText) {
                                 if self?.listView.annotationType == .addImage ||
                                     self?.listView.annotationType == .addText {
                                     let textItem = self?.toolbarController.findItem(KMToolbarAddTextEditPDFItemIdentifier)
@@ -1242,11 +1243,11 @@ import Cocoa
                                     textItem?.isSelected = false
                                     imageItem?.isSelected = false
                                 }
-                                self!.rightSideViewController.isHidden = true
-                                self!.listView.setShouAddEdit([])
-                                self!.listView.change([.text, .image])
-                                self!.listView.annotationType = .editTextImage
-                                self!.closeRightPane()
+                                self?.rightSideViewController.isHidden = true
+                                self?.listView.setShouAddEdit([])
+                                self?.listView.change([.text, .image])
+                                self?.listView.annotationType = .editTextImage
+                                self?.closeRightPane()
                             }
 
                         } else {