[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1441
Date       : Fri Jul 14 10:12:19 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/camelot.cpp

Elegantly upgrade preferences to included Resource directory. This also should fix Alex's BX#1267


Diff:
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp	(revision 1440)
+++ Trunk/XaraLX/wxOil/camelot.cpp	(revision 1441)
@@ -547,7 +547,7 @@
 
 	// Check the resource dir exists
 	Camelot.DeclarePref( NULL, TEXT("ResourceDir"), &m_strResourceDirPath );
-	if( bFirstRun )
+	if( bFirstRun || m_strResourceDirPath == _T("") )
 	{
 #if !defined(RESOURCE_DIR)
 		std::auto_ptr<char> pszDataPath( br_find_data_dir( "/usr/share" ) );


Xara