Fixes to allow a314 configuration on non default paths

diff --git a/a314/files_pi/a314fs.py b/a314/files_pi/a314fs.py
index d07275b65d3a82ee1de1e74b0b047ebed3d2ad37..6cf45d27102f3e7ea28a275f7d9142f7bcea499a 100755 (executable)
--- a/a314/files_pi/a314fs.py
+++ b/a314/files_pi/a314fs.py
@@ -17,7 +17,11 @@ logging.basicConfig(format = '%(levelname)s, %(asctime)s, %(name)s, line %(linen
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
-CONFIG_FILE_PATH = 'a314/files_pi/a314fs.conf'
+try:
+    idx = sys.argv.index('-conf-file')
+    CONFIG_FILE_PATH = sys.argv[idx + 1]
+except (ValueError, IndexError):
+    CONFIG_FILE_PATH = 'a314/files_pi/a314fs.conf'
 
 SHARED_DIRECTORY = 'data/a314shared'
 METAFILE_EXTENSION = ':a314'

diff --git a/platforms/amiga/amiga-platform.c b/platforms/amiga/amiga-platform.c
index a7a8f34e646fd5c0726f3536361c99f8c80a77d0..160d2f90c9afa9e5577b65e0cff08fb878246a8c 100644 (file)
--- a/platforms/amiga/amiga-platform.c
+++ b/platforms/amiga/amiga-platform.c
@@ -449,7 +449,7 @@ void setvar_amiga(struct emulator_config *cfg, char *var, char *val) {
             a314_emulation_enabled = 1;
         }
     }
-    if CHKVAR("a314conf") {
+    if CHKVAR("a314_conf") {
         if (val && strlen(val) != 0) {
             a314_set_config_file(val);
         }