Skip to content

Commit c574ce2

Browse files
committed
Reimplement TSaveSourceMgr.FileTypeFromFilterIdx
This method was changed to simply call TSourceFileInfo.FileTypeFromFilterIdx for the currently selected filter in the associated dialogue's filter string, instead of calculating the value locally. Note that the new method is much more resilient to future changes than the original implementation which made assumptions about a one to one relationship between filter indexes and file types.
1 parent 5d8cb55 commit c574ce2

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

Src/USaveSourceMgr.pas

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -215,16 +215,8 @@ procedure TSaveSourceMgr.EncodingQueryHandler(Sender: TObject;
215215
end;
216216

217217
function TSaveSourceMgr.FileTypeFromFilterIdx: TSourceFileType;
218-
var
219-
FilterIdx: Integer; // dlg FilterIndex adjusted to be 0 based
220218
begin
221-
FilterIdx := fSaveDlg.FilterIndex - 1;
222-
Assert(
223-
(FilterIdx >= Ord(Low(TSourceFileType)))
224-
and (FilterIdx <= Ord(High(TSourceFileType))),
225-
ClassName + '.FileTypeFromFilterIdx: FilerIdx out of range'
226-
);
227-
Result := TSourceFileType(FilterIdx)
219+
Result := fSourceFileInfo.FileTypeFromFilterIdx(fSaveDlg.FilterIndex);
228220
end;
229221

230222
function TSaveSourceMgr.GenerateOutput(const FileType: TSourceFileType):

0 commit comments

Comments
 (0)