From 093b1bc1787007e49634a52f0afc59cd3f4ec84b Mon Sep 17 00:00:00 2001 From: J-D-K Date: Wed, 13 Oct 2021 17:20:42 -0400 Subject: [PATCH] Fix file mode copy file --- src/fs.cpp | 4 ++-- src/fs/file.cpp | 4 ++-- src/ui/ttl.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fs.cpp b/src/fs.cpp index 63a6d35..5450358 100644 --- a/src/fs.cpp +++ b/src/fs.cpp @@ -607,7 +607,7 @@ void fs::dumpAllUserSaves(void *a) } fs::unmountSave(); } - delete c; + fs::copyArgsDestroy(c); t->finished = true; } @@ -644,7 +644,7 @@ void fs::dumpAllUsersAllSaves(void *a) fs::unmountSave(); } } - delete c; + fs::copyArgsDestroy(c); t->finished = true; } diff --git a/src/fs/file.cpp b/src/fs/file.cpp index b6f9dc5..85ce28f 100644 --- a/src/fs/file.cpp +++ b/src/fs/file.cpp @@ -185,7 +185,7 @@ static void copyFileThreaded_t(void *a) threadInfo *t = (threadInfo *)a; fs::copyArgs *in = (fs::copyArgs *)t->argPtr; - t->status->setStatus(ui::getUICString("threadStatusCopyingFile", 0), in->src); + t->status->setStatus(ui::getUICString("threadStatusCopyingFile", 0), in->src.c_str()); fs::copyFile(in->src, in->dst, t); if(in->cleanup) @@ -291,7 +291,7 @@ static void copyFileCommit_t(void *a) threadInfo *t = (threadInfo *)a; fs::copyArgs *in = (fs::copyArgs *)t->argPtr; - t->status->setStatus(ui::getUICString("threadStatusCopyingFile", 0), in->src); + t->status->setStatus(ui::getUICString("threadStatusCopyingFile", 0), in->src.c_str()); in->prog->setMax(fs::fsize(in->src)); in->prog->update(0); diff --git a/src/ui/ttl.cpp b/src/ui/ttl.cpp index b9ea34c..f9886cd 100644 --- a/src/ui/ttl.cpp +++ b/src/ui/ttl.cpp @@ -318,7 +318,7 @@ static void infoPanelDraw(void *a) rectWidth = width - 20; iconX = (width / 2) - 128; - gfx::texDraw(panel, data::getTitleIconByTID(d->tid), iconX, 32); + gfx::texDraw(panel, data::getTitleIconByTID(d->tid), iconX, 24); gfx::drawRect(panel, &ui::rectLt, 10, drawY, rectWidth, 38); gfx::drawTextf(panel, 18, 20, drawY + 10, &ui::txtCont, data::getTitleNameByTID(d->tid).c_str());