Merge pull request #969 from laanwj/2012_03_printconsole_error

replace call to PrintConsole with call to error()

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 9fb92af..18d30c8 100644 (file)
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -244,7 +244,7 @@ CODECFORTR = UTF-8
 TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
 
 isEmpty(QMAKE_LRELEASE) {
-    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
 }
 isEmpty(TS_DIR):TS_DIR = src/qt/locale

diff --git a/src/net.cpp b/src/net.cpp
index b22300e..94ef7e7 100644 (file)
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -559,6 +559,7 @@ void CNode::CloseSocketDisconnect()
         printf("disconnecting node %s\n", addr.ToString().c_str());
         closesocket(hSocket);
         hSocket = INVALID_SOCKET;
+        vRecv.clear();
     }
 }