add export functionality for address book / receiving addresses

[novacoin.git] / src / qt / bitcoin.cpp

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index c31be1b..78a20c5 100644 (file)
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -3,6 +3,7 @@
  */
 #include "bitcoingui.h"
 #include "clientmodel.h"
+#include "walletmodel.h"
 
 #include "headers.h"
 #include "init.h"
@@ -112,19 +113,23 @@ int main(int argc, char *argv[])
     {
         if(AppInit2(argc, argv))
         {
-            BitcoinGUI window;
-            ClientModel model(pwalletMain);
-            guiref = &window;
-            window.setModel(&model);
-
-            window.show();
-
-            int retval = app.exec();
-
-            guiref = 0;
+            {
+                // Put this in a block, so that BitcoinGUI is cleaned up properly before
+                // calling shutdown.
+                BitcoinGUI window;
+                ClientModel clientModel(pwalletMain);
+                WalletModel walletModel(pwalletMain);
+                guiref = &window;
+                window.setClientModel(&clientModel);
+                window.setWalletModel(&walletModel);
+
+                window.show();
+
+                app.exec();
+
+                guiref = 0;
+            }
             Shutdown(NULL);
-
-            return retval;
         }
         else
         {
@@ -135,4 +140,5 @@ int main(int argc, char *argv[])
     } catch (...) {
         PrintException(NULL, "Runaway exception");
     }
+    return 0;
 }