Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin

2011-04-12 14:22:12 -04:00
parent 2e8b33824f 8bb5edc1c9
commit 79706a8e48
30 changed files with 362 additions and 32 deletions
--- a/db.cpp
+++ b/db.cpp
@@ -790,7 +790,7 @@ bool CWalletDB::LoadWallet()
                if (strKey == "fMinimizeOnClose")   ssValue >> fMinimizeOnClose;
                if (strKey == "fUseProxy")          ssValue >> fUseProxy;
                if (strKey == "addrProxy")          ssValue >> addrProxy;
-
+                if (fHaveUPnP && strKey == "fUseUPnP")           ssValue >> fUseUPnP;
            }
        }
        pcursor->close();
@@ -807,6 +807,8 @@ bool CWalletDB::LoadWallet()
    printf("fMinimizeOnClose = %d\n", fMinimizeOnClose);
    printf("fUseProxy = %d\n", fUseProxy);
    printf("addrProxy = %s\n", addrProxy.ToString().c_str());
+    if (fHaveUPnP)
+        printf("fUseUPnP = %d\n", fUseUPnP);


    // Upgrade