Merge branch 'master' of github.com:novacoin-project/novacoin

[novacoin.git] / src / init.cpp

diff --git a/src/init.cpp b/src/init.cpp
index 8fec3c6..994c784 100644 (file)
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -903,14 +903,12 @@ bool AppInit2()
         if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), ""))
             strErrors << _("Cannot write default address") << "\n";
 
-        if (fTestNet || GetTime() < SMALLDATA_SWITCH_TIME) {
-            CMalleableKeyView keyView = pwalletMain->GenerateNewMalleableKey();
-            CMalleableKey mKey;
-            if (!pwalletMain->GetMalleableKey(keyView, mKey))
-                strErrors << _("Unable to generate new malleable key");
-            if (!pwalletMain->SetAddressBookName(CBitcoinAddress(keyView.GetMalleablePubKey()), ""))
-                strErrors << _("Cannot write default address") << "\n";
-        }
+        CMalleableKeyView keyView = pwalletMain->GenerateNewMalleableKey();
+        CMalleableKey mKey;
+        if (!pwalletMain->GetMalleableKey(keyView, mKey))
+            strErrors << _("Unable to generate new malleable key");
+        if (!pwalletMain->SetAddressBookName(CBitcoinAddress(keyView.GetMalleablePubKey()), ""))
+            strErrors << _("Cannot write default address") << "\n";
     }
 
     printf("%s", strErrors.str().c_str());
@@ -1013,7 +1011,7 @@ bool AppInit2()
 #if !defined(QT_GUI)
     // Loop until process is exit()ed from shutdown() function,
     // called from ThreadRPCServer thread when a "stop" command is received.
-    while (1)
+    for ( ; ; )
         Sleep(5000);
 #endif