80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix up exe_path when running as AppImage

Browse Source
This commit is contained in:
David Hrdlička
2022-04-08 01:49:04 +02:00
parent db2b868909
commit 37b478d25e
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/86box.c
View File

@@ -413,6 +413,14 @@ pc_init(int argc, char *argv[])
p = plat_get_filename(exe_path); p = plat_get_filename(exe_path);
*p = '\0'; *p = '\0';
#if !defined(_WIN32) && !defined(__APPLE__)
/* Grab the actual path if we are an AppImage. */
appimage = getenv("APPIMAGE");
if (appimage && (appimage[0] != '\0')) {
plat_get_dirname(exe_path, appimage);
}
#endif
/* /*
* Get the current working directory. * Get the current working directory.
* *
@@ -591,21 +599,10 @@ usage:
// Add the VM-local ROM path. // Add the VM-local ROM path.
plat_append_filename(temp, usr_path, "roms"); plat_append_filename(temp, usr_path, "roms");
plat_path_slash(temp);
rom_add_path(temp); rom_add_path(temp);
// Add the standard ROM path in the same directory as the executable. // Add the standard ROM path in the same directory as the executable.
#if !defined(_WIN32) && !defined(__APPLE__)
appimage = getenv("APPIMAGE");
if (appimage && (appimage[0] != '\0')) {
plat_append_filename(temp, appimage, "roms");
} else {
#endif
plat_append_filename(temp, exe_path, "roms"); plat_append_filename(temp, exe_path, "roms");
#if !defined(_WIN32) && !defined(__APPLE__)
}
#endif
rom_add_path(temp); rom_add_path(temp);
plat_init_rom_paths(); plat_init_rom_paths();