diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2011-04-12 14:22:12 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-04-12 14:22:12 -0400 |
commit | 79706a8e48a043b9ca83216ba9cbb7413e81710d (patch) | |
tree | 8da44bcaca6b7a3ce02c589957da284ac8adf9dd /db.cpp | |
parent | 2e8b33824f4bd76efd84837335eeb8a025787b4b (diff) | |
parent | 8bb5edc1c9054d835ef79c9f1ab3e021b0693303 (diff) | |
download | bitcoin-79706a8e48a043b9ca83216ba9cbb7413e81710d.tar.xz |
Merge branch 'upnp' of https://github.com/TheBlueMatt/bitcoin
Diffstat (limited to 'db.cpp')
-rw-r--r-- | db.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |