openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File basepk3.diff of Package slade (Revision 2c892080dbde5fbe41088dccb5bc8caf)

Currently displaying revision 2c892080dbde5fbe41088dccb5bc8caf , Show latest

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

Places

File basepk3.diff of Package slade (Revision 2c892080dbde5fbe41088dccb5bc8caf)

Places