Merge pull request #1179 from Diapolo/project-file

add bitcoin-qt.rc to OTHER_FILES (shown in Qt Creator)

diff --git a/src/net.cpp b/src/net.cpp
index d218dcf..92b4a31 100644 (file)
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1585,12 +1585,16 @@ void StartNode(void* parg)
     {
         vector<CNetAddr> vaddr;
         if (LookupHost(pszHostName, vaddr))
+        {
             BOOST_FOREACH (const CNetAddr &addr, vaddr)
+            {
                 if (!addr.IsLocal())
                 {
                     addrLocalHost.SetIP(addr);
                     break;
                 }
+            }
+        }
     }
 #else
     // Get local host ip

diff --git a/src/util.cpp b/src/util.cpp
index cd3d3b9..3569f22 100644 (file)
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -252,7 +252,7 @@ inline int OutputDebugStringF(const char* pszFormat, ...)
             *pend = '\0';
             char* p1 = pszBuffer;
             char* p2;
-            while (p2 = strchr(p1, '\n'))
+            while ((p2 = strchr(p1, '\n')))
             {
                 p2++;
                 char c = *p2;