From def155af87912788aca3cdeae0c894ae2d250092 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Tue, 3 Feb 2009 10:15:59 +0100
Subject: [PATCH] Upstream tarball 9413

---
 .svn-revision | 2 +-
 src/amule.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 9d058193..199a0b96 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-9412
+9413
diff --git a/src/amule.cpp b/src/amule.cpp
index 3653368f..db4a720e 100644
--- a/src/amule.cpp
+++ b/src/amule.cpp
@@ -542,9 +542,11 @@ bool CamuleApp::OnInit()
 #else
 	AddLogLineMS(false, wxT("Checking if there is an instance already running..."));
 
-	m_singleInstance = new wxSingleInstanceChecker(wxT("muleLock"), ConfigDir);
-	if (m_singleInstance->IsAnotherRunning()) {
+	m_singleInstance = new wxSingleInstanceChecker();
+	if (m_singleInstance->Create(wxT("muleLock"), ConfigDir)
+		&& m_singleInstance->IsAnotherRunning()) {
 		AddLogLineMS(true, wxT("There is an instance of aMule already running"));
+		AddLogLineNS(CFormat(wxT("(lock file: %s%s)")) % ConfigDir % wxT("muleLock"));
 		
 		// This is very tricky. The most secure way to communicate is via ED2K links file
 		wxTextFile ed2kFile(ConfigDir + wxT("ED2KLinks"));
-- 
2.11.4.GIT