summaryrefslogtreecommitdiff
path: root/protocols/AimOscar/src/file.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/AimOscar/src/file.cpp')
-rw-r--r--protocols/AimOscar/src/file.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/protocols/AimOscar/src/file.cpp b/protocols/AimOscar/src/file.cpp
index b8eb1840f0..d47aa56b02 100644
--- a/protocols/AimOscar/src/file.cpp
+++ b/protocols/AimOscar/src/file.cpp
@@ -120,24 +120,22 @@ bool setup_next_file_send(file_transfer *ft)
ft->pfts.currentFileProgress = 0;
char* fnamea;
- char* fname = mir_utf8encodeT(file);
+ T2Utf fname(file);
if (ft->pfts.totalFiles > 1 && ft->file[0])
{
size_t dlen = mir_strlen(ft->file);
if (strncmp(fname, ft->file, dlen) == 0 && fname[dlen] == '\\')
{
fnamea = &fname[dlen+1];
- for (char *p = fnamea; *p; ++p) { if (*p == '\\') *p = 1; }
+ for (char *p = fnamea; *p; ++p)
+ if (*p == '\\')
+ *p = 1;
}
- else
- fnamea = get_fname(fname);
+ else fnamea = get_fname(fname);
}
- else
- fnamea = get_fname(fname);
+ else fnamea = get_fname(fname);
send_init_oft2(ft, fnamea);
-
- mir_free(fname);
return true;
}