Merge pull request #1299 from RichardRanft/developmentOrigin

Add static String::isEmpty(const char*) method

Engine/source/core/util/str.cpp

@@ -657,6 +657,11 @@ bool String::isEmpty() const
    return ( _string == StringData::Empty() );
 }
 
+bool String::isEmpty(const char* str)
+{
+	return str == 0 || str[0] == '\0';
+}
+
 bool String::isShared() const
 {
    return _string->isShared();

Engine/source/core/util/str.h

@@ -74,6 +74,7 @@ public:
    SizeType size() const;     ///< Returns the length of the string in bytes including the NULL terminator.
    SizeType numChars() const; ///< Returns the length of the string in characters.
    bool     isEmpty() const;  ///< Is this an empty string [""]?
+   static bool isEmpty(const char*); // is the input empty?
    bool     isNotEmpty() const { return !isEmpty(); }  ///< Is this not an empty string [""]?
 
    /// Erases all characters in a string.

Engine/source/forest/forest.cpp

@@ -354,7 +354,7 @@ void Forest::createNewFile()
 
 void Forest::saveDataFile( const char *path )
 {
-   if ( path )
+   if ( path && !String::isEmpty(path))
       mDataFileName = StringTable->insert( path );
 
    if ( mData )