fix reading/writing of block image in LOOKS file

katahiromz · Apr 5, 2024 · c88c3b9 · c88c3b9
1 parent 3a41d74
commit c88c3b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/GUI.cpp b/GUI.cpp
@@ -2099,12 +2099,10 @@ BOOL XgImportLooks(HWND hwnd, LPCWSTR pszFileName)
     // 黒マス画像。
     GetPrivateProfileStringW(L"Looks", L"BlackCellImage", L"", szText, _countof(szText), pszFileName);
     xg_strBlackCellImage = szText;
-
-    ::DeleteObject(xg_hbmBlackCell);
-    xg_hbmBlackCell = nullptr;
-    ::DeleteEnhMetaFile(xg_hBlackCellEMF);
-    xg_hBlackCellEMF = nullptr;
-    XgGetFileManager()->load_block_image(xg_strBlackCellImage, xg_hbmBlackCell, xg_hBlackCellEMF);
+    if (XgGetFileManager()->load_block_image(xg_strBlackCellImage))
+        xg_strBlackCellImage = XgGetFileManager()->get_canonical(xg_strBlackCellImage);
+    else
+        xg_strBlackCellImage.clear();
 
     // 二重マス文字。
     GetPrivateProfileStringW(L"Looks", L"DoubleFrameLetters", XgLoadStringDx1(IDS_DBLFRAME_LETTERS_1), szText, _countof(szText), pszFileName);

diff --git a/HISTORY.txt b/HISTORY.txt
@@ -313,6 +313,7 @@
 - 2024-XX-YY ver.5.2.3
     - Added "Open app folder" item to "Advanced" settings.
     - Fixed the board not updating when dropping a LOOKS file.
+    - Fixed the reading and writing of block image in LOOKS files.
 
 # 開発履歴 (Japanese)
 
@@ -945,3 +946,4 @@
     - ReadMeを更新。
     - 上級者向け設定に「アプリのフォルダを開く」を追加。
     - LOOKSファイルをドロップしたときに盤面が更新されなかったのを修正。
+    - LOOKSファイルの黒マス画像の読み書きを修正。
diff --git a/XG_SettingsDialog.cpp b/XG_SettingsDialog.cpp
@@ -223,13 +223,9 @@ BOOL XG_SettingsDialog::OnOK(HWND hwnd)
     XGStringW strBlock = szText;
     xg_str_trim(strBlock);
     if (XgGetFileManager()->load_block_image(strBlock))
-    {
         xg_strBlackCellImage = XgGetFileManager()->get_canonical(strBlock);
-    }
     else
-    {
         xg_strBlackCellImage.clear();
-    }
 
     // スケルトンビューか？
     if (::IsDlgButtonChecked(hwnd, chx1) == BST_CHECKED)