fixed compilation problem in SetTimes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 34fafde83d8a2df7c3ba64b1e4a43bc85e02dee2..d3f34e5aa2e9e7a573a3cf850093753fd68e04f8 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -899,9 +899,17 @@ bool wxFileName::SetTimes(const wxDateTime *dtCreate,
                           const wxDateTime *dtMod)
 {
 #if defined(__UNIX_LIKE__)
                           const wxDateTime *dtMod)
 {
 #if defined(__UNIX_LIKE__)

+    if ( !dtAccess && !dtMod )
+    {
+        // can't modify the creation time anyhow, don't try
+        return TRUE;
+    }
+
+    // if dtAccess or dtMod is not specified, use the other one (which must be
+    // non NULL because of the test above) for both times

     utimbuf utm;
     utimbuf utm;

-    utm.actime = dtAccess ? dtAccess : dtAccess->GetTicks();
-    utm.modtime = dtMod ? dtMod : dtMod->GetTicks();
+    utm.actime = dtAccess ? dtAccess->GetTicks() : dtMod->GetTicks();
+    utm.modtime = dtMod ? dtMod->GetTicks() : dtAccess->GetTicks();

     if ( utime(GetFullPath(), &utm) == 0 )
     {
         return TRUE;
     if ( utime(GetFullPath(), &utm) == 0 )
     {
         return TRUE;