Merge branch 'master' of github.com:openframeworks/openFrameworks

kisoon · Oct 10, 2011 · fa65aff · fa65aff
2 parents 04f44b0 + 666c869
commit fa65aff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/libs/openFrameworks/app/ofAppRunner.cpp b/libs/openFrameworks/app/ofAppRunner.cpp
@@ -60,11 +60,6 @@ void ofRunApp(ofBaseApp * OFSA){
 		OFSAptr->mouseY = 0;
 	}
 
-	#ifdef TARGET_OSX
-		//this internally checks the executable path for osx
-		ofSetDataPathRoot("../../../data/");
-	#endif
-
 	atexit(ofExitCallback);
 
 	#ifdef WIN32_HIGH_RES_TIMING
@@ -161,11 +156,6 @@ void ofRunApp(ofPtr<ofBaseApp> OFSA){
 		OFSAptr->mouseY = 0;
 	}
 
-	#ifdef TARGET_OSX 
-		//this internally checks the executable path for osx
-		ofSetDataPathRoot("../../../data/");
-	#endif
-
 	atexit(ofExitCallback);
 
 	#ifdef WIN32_HIGH_RES_TIMING

diff --git a/libs/openFrameworks/utils/ofUtils.cpp b/libs/openFrameworks/utils/ofUtils.cpp
@@ -213,6 +213,8 @@ void ofDisableDataPath(){
 	static string dataPathRoot = "data/";
 #endif
 
+static bool isDataPathSet = false;
+
 //--------------------------------------------------
 void ofSetDataPathRoot(string newRoot){
 	string newPath = "";
@@ -248,11 +250,17 @@ void ofSetDataPathRoot(string newRoot){
 			}
 		#endif
 	#endif
+
 	dataPathRoot = newRoot;
+	isDataPathSet = true;
 }
 
 //--------------------------------------------------
 string ofToDataPath(string path, bool makeAbsolute){
+
+	if (!isDataPathSet)
+		ofSetDataPathRoot(dataPathRoot);
+
 	if( enableDataPath ){
 
 		//check if absolute path has been passed or if data path has already been applied