Don't specialize std::numeric_limits<> for wxLongLong when using VC6.

[wxWidgets.git] / src / unix / snglinst.cpp

diff --git a/src/unix/snglinst.cpp b/src/unix/snglinst.cpp
index 26bab35d8bcdfb1120637ce42fd8e25433bfeb83..ef2f83ac9532fe816cfb0cdb9c1fc56a5d0cc35f 100644 (file)
--- a/src/unix/snglinst.cpp
+++ b/src/unix/snglinst.cpp
@@ -7,7 +7,7 @@
 // Created:     09.06.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -348,10 +348,10 @@ bool wxSingleInstanceChecker::Create(const wxString& name,
                                      const wxString& path)
 {
     wxASSERT_MSG( !m_impl,
-                  _T("calling wxSingleInstanceChecker::Create() twice?") );
+                  wxT("calling wxSingleInstanceChecker::Create() twice?") );
 
     // must have the file name to create a lock file
-    wxASSERT_MSG( !name.empty(), _T("lock file name can't be empty") );
+    wxASSERT_MSG( !name.empty(), wxT("lock file name can't be empty") );
 
     m_impl = new wxSingleInstanceCheckerImpl;
 
@@ -361,9 +361,9 @@ bool wxSingleInstanceChecker::Create(const wxString& name,
         fullname = wxGetHomeDir();
     }
 
-    if ( fullname.Last() != _T('/') )
+    if ( fullname.Last() != wxT('/') )
     {
-        fullname += _T('/');
+        fullname += wxT('/');
     }
 
     fullname << name;
@@ -371,13 +371,23 @@ bool wxSingleInstanceChecker::Create(const wxString& name,
     return m_impl->Create(fullname);
 }
 
-bool wxSingleInstanceChecker::IsAnotherRunning() const
+bool wxSingleInstanceChecker::DoIsAnotherRunning() const
 {
-    wxCHECK_MSG( m_impl, false, _T("must call Create() first") );
+    wxCHECK_MSG( m_impl, false, wxT("must call Create() first") );
+
+    const pid_t lockerPid = m_impl->GetLockerPID();
+
+    if ( !lockerPid )
+    {
+        // we failed to open the lock file, return false as we're definitely
+        // not sure that another our process is running and so it's better not
+        // to prevent this one from starting up
+        return false;
+    }
 
     // if another instance is running, it must own the lock file - otherwise
     // we have it and the locker PID is ours one
-    return m_impl->GetLockerPID() != getpid();
+    return lockerPid != getpid();
 }
 
 wxSingleInstanceChecker::~wxSingleInstanceChecker()