From 247749934b8fd2fb972a9fe2aa9b43c057278bd9 Mon Sep 17 00:00:00 2001
From: Michael Hansen <zrax0111@gmail.com>
Date: Thu, 9 Feb 2012 21:29:23 -0800
Subject: [PATCH] Fix pnUUID compilation on Linux

---
 Sources/Plasma/Apps/plClient/winmain.cpp          | 2 +-
 Sources/Plasma/NucleusLib/pnUUID/pnUUID.h         | 2 +-
 Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp
index 1648fad9..fd8daf5b 100644
--- a/Sources/Plasma/Apps/plClient/winmain.cpp
+++ b/Sources/Plasma/Apps/plClient/winmain.cpp
@@ -1129,8 +1129,8 @@ void StatusCallback(void *param)
         }
     }
 
-    delete [] statusUrl;
     curl_easy_cleanup(hCurl);
+    delete [] statusUrl;
 
     s_statusEvent.Signal();
 }
diff --git a/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
index c8102dcf..10810071 100644
--- a/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
+++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUID.h
@@ -74,7 +74,7 @@ public:
     int     CompareTo( const plUUID * v ) const;
     bool    IsEqualTo( const plUUID * v ) const;
     bool    FromString( const char * str );
-    bool    FromString( const plString & str );
+    bool    FromString( const plString & str ) { return FromString( str.c_str() ); }
     bool    ToString( plString & out ) const;
     plString AsString() const;
     void    Read( hsStream * s );
diff --git a/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp b/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
index 10ef5d86..98f58772 100644
--- a/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
+++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Win32.cpp
@@ -88,11 +88,6 @@ bool plUUID::FromString( const char * str )
     return RPC_S_OK == UuidFromString( (unsigned char *)str, (GUID *)this );
 }
 
-bool plUUID::FromString( const plString & str )
-{
-    return FromString( str.c_str() );
-}
-
 bool plUUID::ToString( plString & out ) const
 {
     out = _TEMP_CONVERT_FROM_LITERAL("");