From b9561d199058bd27dcbb441a91a933f13f649ab3 Mon Sep 17 00:00:00 2001 From: glushchenko Date: Sat, 7 May 2022 13:18:12 +0300 Subject: [PATCH] - Fixes not updated notes list on ESC --- FSNotes.xcodeproj/project.pbxproj | 16 ++++++++-------- FSNotes/ViewController.swift | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/FSNotes.xcodeproj/project.pbxproj b/FSNotes.xcodeproj/project.pbxproj index 536be4dd2..62c0bed7c 100644 --- a/FSNotes.xcodeproj/project.pbxproj +++ b/FSNotes.xcodeproj/project.pbxproj @@ -4542,7 +4542,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 523; + CURRENT_PROJECT_VERSION = 524; DEVELOPMENT_TEAM = 866P6MTE92; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; ENABLE_HARDENED_RUNTIME = YES; @@ -4555,7 +4555,7 @@ INFOPLIST_FILE = "FSNotes Info (Notarized).plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 5.4.1; + MARKETING_VERSION = 5.4.2; PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes; PRODUCT_NAME = FSNotes; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -4577,7 +4577,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 523; + CURRENT_PROJECT_VERSION = 524; DEPLOYMENT_LOCATION = NO; DEVELOPMENT_TEAM = 866P6MTE92; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; @@ -4591,7 +4591,7 @@ INFOPLIST_FILE = "FSNotes Info (Notarized).plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 5.4.1; + MARKETING_VERSION = 5.4.2; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes; PRODUCT_NAME = FSNotes; @@ -4908,7 +4908,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 523; + CURRENT_PROJECT_VERSION = 524; DEVELOPMENT_TEAM = 866P6MTE92; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; ENABLE_NS_ASSERTIONS = NO; @@ -4920,7 +4920,7 @@ INFOPLIST_FILE = FSNotes/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 5.4.1; + MARKETING_VERSION = 5.4.2; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes; PRODUCT_NAME = FSNotes; @@ -4942,7 +4942,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 523; + CURRENT_PROJECT_VERSION = 524; DEPLOYMENT_LOCATION = NO; DEVELOPMENT_TEAM = 866P6MTE92; EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES; @@ -4955,7 +4955,7 @@ INFOPLIST_FILE = FSNotes/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; - MARKETING_VERSION = 5.4.1; + MARKETING_VERSION = 5.4.2; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes; PRODUCT_NAME = FSNotes; diff --git a/FSNotes/ViewController.swift b/FSNotes/ViewController.swift index d52a69a2e..af27274cd 100644 --- a/FSNotes/ViewController.swift +++ b/FSNotes/ViewController.swift @@ -1726,13 +1726,13 @@ class ViewController: NSViewController, return } - self.notesTableView.noteList = orderedNotesList - if operation.isCancelled { completion() return } + self.notesTableView.noteList = orderedNotesList + guard self.notesTableView.noteList.count > 0 else { DispatchQueue.main.async { self.editArea.clear()