From b59b8d53458c371aaacbf9288de7a3c11d9c7de2 Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Wed, 19 Oct 2022 10:37:44 +0800 Subject: [PATCH] LMMgr // Fix malfunctioned loadCassetteData(). --- .../Sources/LangModelAssembly/LMInstantiator.swift | 2 +- Source/Modules/LMMgr.swift | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator.swift b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator.swift index fc1af0b8..a2331f26 100644 --- a/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator.swift +++ b/Packages/vChewing_LangModelAssembly/Sources/LangModelAssembly/LMInstantiator.swift @@ -205,7 +205,7 @@ extension vChewingLM { } } - public func loadCassetteData(path: String) { + public static func loadCassetteData(path: String) { DispatchQueue.main.async { if FileManager.default.isReadableFile(atPath: path) { Self.lmCassette.close() diff --git a/Source/Modules/LMMgr.swift b/Source/Modules/LMMgr.swift index 453ca5a8..3c4b21ab 100644 --- a/Source/Modules/LMMgr.swift +++ b/Source/Modules/LMMgr.swift @@ -197,13 +197,7 @@ public enum LMMgr { /// 載入磁帶資料。 /// - Remark: cassettePath() 會在輸入法停用磁帶時直接返回 public static func loadCassetteData() { - let pathForCassette = cassettePath() - if !Self.lmCHT.isCassetteEnabled { - Self.lmCHT.loadCassetteData(path: pathForCassette) - } - if !Self.lmCHS.isCassetteEnabled { - Self.lmCHT.loadCassetteData(path: pathForCassette) - } + vChewingLM.LMInstantiator.loadCassetteData(path: cassettePath()) } public static func loadUserPhrasesData() {