From 6d08efb05a3ed58dadf7e280d4a683293961ff78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Sch=C3=BCmann?= Date: Fri, 11 Apr 2014 00:56:58 +0000 Subject: SendSS: ! translation fixes (CSendFTPFile,CSendHTTPServer) ! fixed some error handling (CSendHTTPServer,CSendImageShack) * allow silent sending with all CSend's (CSend, CSendDropbox, CSendFTPFile, CSendImageShack) we also use this for Dropbox since we don't know the upload progress * CSend's addition to r8939 (mir_freeAndNil() removed with mir_free() in some places) git-svn-id: http://svn.miranda-ng.org/main/trunk@8942 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp') diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp index 4b9b7d9e00..cc705ba0e0 100644 --- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp +++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.cpp @@ -56,8 +56,9 @@ int CSendHTTPServer::Send() { if(!m_hContact) return 1; if (CallService(MS_HTTP_ACCEPT_CONNECTIONS, (WPARAM)true, 0) != 0) { - Error(NULL, TranslateT("Could not start the HTTP Server plugin.")); - return 1; + Error(LPGENT("Could not start the HTTP Server plugin.")); + Exit(ACKRESULT_FAILED); + return !m_bAsync; } if (!m_pszFileName) { @@ -102,7 +103,7 @@ void CSendHTTPServer::SendThread() { } if (ret != 0) { - Error(TranslateT("%s (%i):\nCould not add a share to the HTTP Server plugin."),TranslateTS(m_pszSendTyp),ret); + Error(LPGENT("%s (%i):\nCould not add a share to the HTTP Server plugin."),TranslateTS(m_pszSendTyp),ret); Exit(ret); return; } -- cgit v1.2.3