[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1142
Date       : Sat May 20 09:34:49 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/app.cpp

Change template path to /usr/share/xaralx/Templates (also re-default template path if existing one doesn't exist)


Diff:
Index: Trunk/XaraLX/Kernel/app.cpp
===================================================================
--- Trunk/XaraLX/Kernel/app.cpp	(revision 1141)
+++ Trunk/XaraLX/Kernel/app.cpp	(revision 1142)
@@ -611,13 +611,13 @@
 
 	//Graham 21/10/97: If it is blank, then we should use the
 	//exe path with "	emplates\" on the end
-	if (m_TemplatesPath.IsEmpty())
+	if( m_TemplatesPath.IsEmpty() || !wxDir::Exists( m_TemplatesPath ) )
 	{
 		std::auto_ptr<char> Pathname( br_find_data_dir( "/usr/share" ) );
 
 		// Put the path name into a string
 		String_256 strPathname( Pathname.get() );
-		strPathname += _T("/xarlx/doc/");
+		strPathname += _T("/xarlx/");
 		PathName ModulePath(strPathname);
 
 		m_TemplatesPath = ModulePath.GetLocation(TRUE);
@@ -629,7 +629,7 @@
 
 #if defined(_DEBUG)
 		if( !wxDir::Exists( m_TemplatesPath ) )
-			m_TemplatesPath = _T("/usr/share/xaralx/doc/Templates/");
+			m_TemplatesPath = _T("/usr/share/xaralx/Templates/");
 #endif
 	}
 	


Xara