29 lines
1001 B
Diff
29 lines
1001 B
Diff
|
From: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
|
||
|
|
Search for the resource file in /usr/share/slade, and prefer ~/.slade
|
||
|
|
over anything else.
|
||
|
|
---
|
||
|
|
src/ArchiveManager.cpp | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
Index: SLADE-3.1.0.5/src/ArchiveManager.cpp
|
||
|
|
===================================================================
|
||
|
|
--- SLADE-3.1.0.5.orig/src/ArchiveManager.cpp
|
||
|
|
+++ SLADE-3.1.0.5/src/ArchiveManager.cpp
|
||
|
|
@@ -138,11 +138,13 @@ bool ArchiveManager::init()
|
||
|
|
}
|
||
|
|
|
||
|
|
// Find slade3.pk3 directory
|
||
|
|
- string dir_slade_pk3 = appPath("slade.pk3", DIR_DATA);
|
||
|
|
+ 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);
|
||
|
|
+ dir_slade_pk3 = "/usr/share/slade/slade.pk3";
|
||
|
|
if (!wxFileExists(dir_slade_pk3))
|
||
|
|
dir_slade_pk3 = "slade.pk3";
|
||
|
|
|