summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--amiga/arexx.c11
-rw-r--r--amiga/gui.c6
2 files changed, 12 insertions, 5 deletions
diff --git a/amiga/arexx.c b/amiga/arexx.c
index 183b8fc98..3b386d3ad 100644
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -142,8 +142,15 @@ void ami_arexx_handle(void)
void ami_arexx_execute(char *script)
{
- LOG(("Executing script: %s", script));
- IDoMethod(arexx_obj, AM_EXECUTE, script, NULL, NULL, NULL, NULL, NULL);
+ char full_script_path[1025];
+ BPTR lock;
+
+ if(lock = Lock(script, ACCESS_READ)) {
+ DevNameFromLock(lock, full_script_path, 1024, DN_FULLPATH);
+ LOG(("Executing script: %s", full_script_path));
+ IDoMethod(arexx_obj, AM_EXECUTE, full_script_path, NULL, NULL, NULL, NULL, NULL);
+ UnLock(lock);
+ }
}
void ami_arexx_cleanup(void)
diff --git a/amiga/gui.c b/amiga/gui.c
index 2f2524fe1..c1169b947 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -580,13 +580,13 @@ static nserror ami_set_options(struct nsoption_s *defaults)
nsoption_setnull_charp(url_file,
(char *)strdup(temp));
- nsoption_setnull_charp(ca_bundle,
- (char *)strdup("PROGDIR:Resources/ca-bundle"));
-
sprintf(temp, "%s/FontGlyphCache", current_user_dir);
nsoption_setnull_charp(font_unicode_file,
(char *)strdup(temp));
+ nsoption_setnull_charp(ca_bundle,
+ (char *)strdup("PROGDIR:Resources/ca-bundle"));
+
/* font defaults */
#ifdef __amigaos4__
nsoption_setnull_charp(font_sans, (char *)strdup("DejaVu Sans"));