From 40f08d86bad406c69f5b98341aa01fef87b842cd Mon Sep 17 00:00:00 2001 From: nyanpasu64 Date: Sat, 15 Mar 2025 00:01:33 -0700 Subject: [PATCH] Fix doubled file extension when saving as .yaml file (#500) --- CHANGELOG.md | 2 +- corrscope/gui/__init__.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99843a6..be96a88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Implement split stereo bar colors (#491) - Add "Reload Font List" menu item to fix missing fonts (#492) -- Remember most recently selected filetype in Render dialog (#493) +- Remember most recently selected filetype in Render dialog (#493, #500) ### Major Changes diff --git a/corrscope/gui/__init__.py b/corrscope/gui/__init__.py index 2ca5792..c88cd0e 100644 --- a/corrscope/gui/__init__.py +++ b/corrscope/gui/__init__.py @@ -563,7 +563,7 @@ class MainWindow(qw.QMainWindow, Ui_MainWindow): """ # Name and extension (no folder). - cfg_filename = self.get_save_filename(cli.YAML_NAME) + cfg_filename = self.get_save_file_stem(cli.YAML_NAME) # Folder is obtained from self.pref.file_dir_ref. extensions = { @@ -731,18 +731,14 @@ class MainWindow(qw.QMainWindow, Ui_MainWindow): return self._cfg_path.name return self.UNTITLED - def get_save_filename(self, suffix: str) -> str: + def get_save_file_stem(self, suffix: str) -> str: """ If file name can be guessed, return "filename.suffix" (no dir). Otherwise return "". Used for saving file or video. """ - stem = cli.get_file_stem(self._cfg_path, self.cfg, default="") - if stem: - return stem + suffix - else: - return "" + return cli.get_file_stem(self._cfg_path, self.cfg, default="") @staticmethod def compute_save_dir(cfg: Config) -> Optional[str]: