From: 0xDEADFACE <masmfan@gmail.com>
Date: Mon, 15 Dec 2014 18:36:53 +0000 (+0300)
Subject: Merge pull request #80 from fsb4000/boost_1_57
X-Git-Tag: nvc-v0.5.1~71
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=7234a8c452ed97f597f99695d886de44c1bfe5c6;hp=dcb8e6bf5d94b7e9a84253cccf20c231cd92ff45;p=novacoin.git

Merge pull request #80 from fsb4000/boost_1_57

обновление библиотек
---

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 87357ca..2563d23 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -509,10 +509,9 @@ void BitcoinGUI::createTrayIcon()
 #ifndef Q_OS_MAC
     // This is built-in on Mac
     trayIconMenu->addSeparator();
-    trayIconMenu->addAction(quitAction);
-
-    notificator = new Notificator(qApp->applicationName(), trayIcon, 0);
+    trayIconMenu->addAction(quitAction);    
 #endif
+    notificator = new Notificator(QApplication::applicationName(), trayIcon, this);
 }
 
 #ifndef Q_OS_MAC
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 1b93219..5f649f4 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -43,11 +43,12 @@ void OptionsModel::Init()
     // These are Qt-only settings:
     nDisplayUnit = settings.value("nDisplayUnit", BitcoinUnits::BTC).toInt();
     bDisplayAddresses = settings.value("bDisplayAddresses", false).toBool();
-     if (!settings.contains("strThirdPartyTxUrls"))
+    if (!settings.contains("strThirdPartyTxUrls")) {
         if(fTestNet)
             settings.setValue("strThirdPartyTxUrls", "");
         else
             settings.setValue("strThirdPartyTxUrls", "https://bitinfocharts.com/novacoin/tx/%s|https://coinplorer.com/NVC/Transactions/%s|https://explorer.novaco.in/tx/%s");
+    }
     strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "https://bitinfocharts.com/novacoin/tx/%s|https://coinplorer.com/NVC/Transactions/%s|https://explorer.novaco.in/tx/%s").toString();
     fMinimizeToTray = settings.value("fMinimizeToTray", false).toBool();
     fMinimizeOnClose = settings.value("fMinimizeOnClose", false).toBool();