Skip to content

obs-outputs: Fix path normalization logic #13206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grimfoss wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

obs-outputs: Fix path normalization logic #13206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/obs-ffmpeg/obs-ffmpeg-mux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,10 +582,10 @@ static void generate_filename(struct ffmpeg_muxer *stream, struct dstr *dst, boo
char *filename = os_generate_formatted_filename(ext, space, fmt);

dstr_copy(dst, dir);
dstr_replace(dst, "\\", "/");
if (dstr_end(dst) != '/')
if (dstr_end(dst) != '/' && dstr_end(dst) != '\\')
dstr_cat_ch(dst, '/');
dstr_cat(dst, filename);
dstr_replace(dst, "\\", "/");

char *slash = strrchr(dst->array, '/');
if (slash) {
Expand Down
4 changes: 2 additions & 2 deletions plugins/obs-outputs/mp4-output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,10 @@ static void generate_filename(struct mp4_output *out, struct dstr *dst, bool ove
char *filename = os_generate_formatted_filename(ext, space, fmt);

dstr_copy(dst, dir);
dstr_replace(dst, "\\", "/");
if (dstr_end(dst) != '/')
if (dstr_end(dst) != '/' && dstr_end(dst) != '\\')
dstr_cat_ch(dst, '/');
dstr_cat(dst, filename);
dstr_replace(dst, "\\", "/");

char *slash = strrchr(dst->array, '/');
if (slash) {
Expand Down