From b86f3b6dcbd86b9be3bc864649c75296ff41df7c Mon Sep 17 00:00:00 2001 From: Andrew Hutchings Date: Tue, 29 Jun 2021 19:50:42 +0100 Subject: [PATCH] Fix PiStorm GUI for source paths If a path was used as source it was appended to the destination, which most of the time caused an error. This is because the filename was isolated but then not used. --- .../pistorm-dev/pistorm_dev_amiga/PiStorm | Bin 16504 -> 16496 bytes .../pistorm_dev_amiga/gui_interact.c | 13 +++++++++---- platforms/amiga/pistorm.hdf | Bin 2621440 -> 2621440 bytes 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/PiStorm b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/PiStorm index 7f1401c12d81dceaa8b419b9aa07d244d8732ca7..a7d5548f8b508c79ff71a21b2a7c1cfdb62a3c54 100755 GIT binary patch delta 2677 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 diff --git a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/gui_interact.c b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/gui_interact.c index b18a556..3227075 100644 --- a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/gui_interact.c +++ b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/gui_interact.c @@ -19,7 +19,7 @@ extern unsigned int pistorm_base_addr; struct ReqToolsBase *ReqToolsBase; -#define VERSION "v0.3.4" +#define VERSION "v0.3.5" #define button1w 54 #define button1h 11 @@ -668,19 +668,24 @@ int main() { fname = GetFileValue_buf; } + else + { + // Remove leading slash + fname++; + } char *destfile = malloc(256); // Turns out WB doesn't like DF0:/filename.ext if (DestinationValue_buf[(strlen(DestinationValue_buf) - 1)] == ':') { - snprintf(destfile, 255, "%s%s", DestinationValue_buf, GetFileValue_buf); + snprintf(destfile, 255, "%s%s", DestinationValue_buf, fname); } else if (!strlen(DestinationValue_buf)) { - snprintf(destfile, 255, "%s", GetFileValue_buf); + snprintf(destfile, 255, "%s", fname); } else { - snprintf(destfile, 255, "%s/%s", DestinationValue_buf, GetFileValue_buf); + snprintf(destfile, 255, "%s/%s", DestinationValue_buf, fname); } BPTR fh = Open(destfile, MODE_NEWFILE); if (!fh) diff --git a/platforms/amiga/pistorm.hdf b/platforms/amiga/pistorm.hdf index 3b0f3564ec1254273d01e23d163b112057a79090..a463295b24c54cd3ab776d33d877c006e6274779 100644 GIT binary patch delta 6106 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 delta 6033 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 bzzC2IGC(HC0@)x3