slade/basepk3.diff

31 lines
1.1 KiB
Diff

From: Jan Engelhardt <jengelh@inai.de>
Search for the resource file in /usr/share/slade, and prefer ~/.slade
over anything else.
(DIR_RES is /usr/share/appinfo according to wxWidgets,
which is not used in Linux distros.)
---
src/Archive/ArchiveManager.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Index: SLADE-3.1.1.4/src/Archive/ArchiveManager.cpp
===================================================================
--- SLADE-3.1.1.4.orig/src/Archive/ArchiveManager.cpp
+++ SLADE-3.1.1.4/src/Archive/ArchiveManager.cpp
@@ -138,14 +138,12 @@ bool ArchiveManager::init()
}
// Find slade3.pk3 directory
- string dir_slade_pk3 = appPath("slade.pk3", DIR_RES);
+ string dir_slade_pk3 = appPath("slade.pk3", DIR_USER);
if (!wxFileExists(dir_slade_pk3))
dir_slade_pk3 = appPath("slade.pk3", DIR_DATA);
if (!wxFileExists(dir_slade_pk3))
dir_slade_pk3 = appPath("slade.pk3", DIR_APP);
if (!wxFileExists(dir_slade_pk3))
- dir_slade_pk3 = appPath("slade.pk3", DIR_USER);
- if (!wxFileExists(dir_slade_pk3))
dir_slade_pk3 = "slade.pk3";
// Open slade.pk3