fixed crash causd by passing CString objects to log

diff --git a/src/StdString.h b/src/StdString.h
index 624f290..298abcb 100755 (executable)
--- a/src/StdString.h
+++ b/src/StdString.h
@@ -643,7 +643,7 @@ public:
        {\r
                // Range check the count.\r
 \r
-               nCount = max(0, min(nCount, static_cast<int>(this->size())));\r
+               nCount = std::max(0, std::min(nCount, static_cast<int>(this->size())));\r
                return this->substr(0, static_cast<MYSIZE>(nCount)); \r
        }\r
 \r
@@ -686,7 +686,7 @@ public:
        {\r
                // Range check the count.\r
 \r
-               nCount = max(0, min(nCount, static_cast<int>(this->size())));\r
+               nCount = std::max(0, std::min(nCount, static_cast<int>(this->size())));\r
                return this->substr(this->size()-static_cast<MYSIZE>(nCount));\r
        }\r
 \r

diff --git a/src/StepMania.cpp b/src/StepMania.cpp
index 9c432f0..cc862f3 100755 (executable)
--- a/src/StepMania.cpp
+++ b/src/StepMania.cpp
@@ -898,7 +898,7 @@ static void MountTreeOfZips( const CString &dir, bool recurse = true )
 static void WriteLogHeader()
 {
        LOG->Info( ProductInfo::getFullVersionString());
-       LOG->Info( "Compiled %s (build %lu)", ProductInfo::getDate(), ProductInfo::getVersion() );
+       LOG->Info( "Compiled %s (build %s)", ProductInfo::getDate().c_str(), ProductInfo::getVersion().c_str() );
 
        time_t cur_time;
        time(&cur_time);