From cb88e17724cbda90501501e1584a1bc41cc85af9 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 9 Dec 2022 09:49:28 +0000 Subject: [PATCH] Fix showing of GUI when opened multiple times. closes #26 --- src/Avalanche_rev.h | 6 +++--- src/Avalanche_rev.i | 6 +++--- src/Avalanche_rev.s | 6 +++--- src/avalanche.c | 5 +++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/Avalanche_rev.h b/src/Avalanche_rev.h index 04ab1dc..8ab3d4f 100644 --- a/src/Avalanche_rev.h +++ b/src/Avalanche_rev.h @@ -1,6 +1,6 @@ #define VERSION 1 #define REVISION 8 -#define DATE "7.12.2022" +#define DATE "9.12.2022" #define VERS "Avalanche 1.8" -#define VSTRING "Avalanche 1.8 (7.12.2022)\r\n" -#define VERSTAG "\0$VER: Avalanche 1.8 (7.12.2022)" +#define VSTRING "Avalanche 1.8 (9.12.2022)\r\n" +#define VERSTAG "\0$VER: Avalanche 1.8 (9.12.2022)" diff --git a/src/Avalanche_rev.i b/src/Avalanche_rev.i index 729922d..1d94480 100644 --- a/src/Avalanche_rev.i +++ b/src/Avalanche_rev.i @@ -2,7 +2,7 @@ VERSION EQU 1 REVISION EQU 8 DATE MACRO - dc.b '7.12.2022' + dc.b '9.12.2022' ENDM VERS MACRO @@ -10,9 +10,9 @@ VERS MACRO ENDM VSTRING MACRO - dc.b 'Avalanche 1.8 (7.12.2022)',13,10,0 + dc.b 'Avalanche 1.8 (9.12.2022)',13,10,0 ENDM VERSTAG MACRO - dc.b 0,'$VER: Avalanche 1.8 (7.12.2022)',0 + dc.b 0,'$VER: Avalanche 1.8 (9.12.2022)',0 ENDM diff --git a/src/Avalanche_rev.s b/src/Avalanche_rev.s index a9f28bc..f252d84 100644 --- a/src/Avalanche_rev.s +++ b/src/Avalanche_rev.s @@ -2,7 +2,7 @@ VERSION = 1 REVISION = 8 .macro DATE -.ascii "7.12.2022" +.ascii "9.12.2022" .endm .macro VERS @@ -10,12 +10,12 @@ REVISION = 8 .endm .macro VSTRING -.ascii "Avalanche 1.8 (7.12.2022)" +.ascii "Avalanche 1.8 (9.12.2022)" .byte 13,10,0 .endm .macro VERSTAG .byte 0 -.ascii "$VER: Avalanche 1.8 (7.12.2022)" +.ascii "$VER: Avalanche 1.8 (9.12.2022)" .byte 0 .endm diff --git a/src/avalanche.c b/src/avalanche.c index bcffe57..884e332 100644 --- a/src/avalanche.c +++ b/src/avalanche.c @@ -654,6 +654,7 @@ int main(int argc, char **argv) /* ARexx port did not already exist */ gui(WBenchMsg, rxsig); } else { + BOOL arc_opened = FALSE; if(WBenchMsg) { struct WBArg *wbarg; @@ -668,11 +669,11 @@ int main(int argc, char **argv) open_archive_from_wbarg_arexx(wbarg); } } + arc_opened = TRUE; } - } else { - ami_arexx_send("SHOW"); } } + if(arc_opened == FALSE) ami_arexx_send("SHOW"); } ami_arexx_cleanup();