Index: trunk/BNC/src/bnccore.h
===================================================================
--- trunk/BNC/src/bnccore.h	(revision 9738)
+++ trunk/BNC/src/bnccore.h	(revision 9739)
@@ -30,5 +30,4 @@
 #include "bncrawfile.h"
 #include "bncephuser.h"
-#include "bncsslconfig.h"
 
 class bncComb;
@@ -57,9 +56,6 @@
   QDateTime         dateAndTimeGPS() const;
   void              setDateAndTimeGPS(QDateTime dateTime);
-  void              setSslConfiguration(const bncSslConfig& sslConfig) {_sslConfig = sslConfig;}
+  void              setConfFileName(const QString& confFileName);
   QString           confFileName() const {return _confFileName;}
-  void              setConfFileName(const QString& confFileName);
-  bncSslConfig      sslConfiguration() const {return _sslConfig;}
-
   void              writeRawData(const QByteArray& data, const QByteArray& staID,
                                  const QByteArray& format);
@@ -150,5 +146,4 @@
   QList<QTcpSocket*>*    _socketsCorr;
   bncCaster*             _caster;
-  bncSslConfig           _sslConfig;
   QString                _confFileName;
   QDate                  _fileDate;
Index: trunk/BNC/src/bncmain.cpp
===================================================================
--- trunk/BNC/src/bncmain.cpp	(revision 9738)
+++ trunk/BNC/src/bncmain.cpp	(revision 9739)
@@ -81,7 +81,6 @@
   bool       displaySet   = false;
 #endif
-  QByteArray   rawFileName;
-  QString      confFileName;
-  bncSslConfig sslConfig;
+  QByteArray rawFileName;
+  QString    confFileName;
 
   QByteArray printHelp =
@@ -394,6 +393,4 @@
   BNC_CORE->setConfFileName( confFileName );
 
-  BNC_CORE->setSslConfiguration( sslConfig );
-
   bncSettings settings;
 
Index: trunk/BNC/src/bncnetqueryv2.cpp
===================================================================
--- trunk/BNC/src/bncnetqueryv2.cpp	(revision 9738)
+++ trunk/BNC/src/bncnetqueryv2.cpp	(revision 9739)
@@ -135,5 +135,5 @@
   // ---------------
   QNetworkRequest request;
-  request.setSslConfiguration(BNC_CORE->sslConfiguration());
+  request.setSslConfiguration(BNC_SSL_CONFIG);
   request.setUrl(_url);
   request.setRawHeader("Host"         , _url.host().toLatin1());
@@ -238,4 +238,5 @@
     msg += err.errorString();
   }
+  BNC_CORE->slotMessage(msg.toLatin1(), true);
 
   if (_sslIgnoreErrors) {
@@ -244,5 +245,4 @@
   }
   else {
-    BNC_CORE->slotMessage(msg.toLatin1(), true);
     stop();
   }
Index: trunk/BNC/src/bncsslconfig.cpp
===================================================================
--- trunk/BNC/src/bncsslconfig.cpp	(revision 9738)
+++ trunk/BNC/src/bncsslconfig.cpp	(revision 9739)
@@ -11,5 +11,5 @@
  * Created:    22-Aug-2011
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -24,10 +24,18 @@
 #include "bncsettings.h"
 
+
+// Singleton
+////////////////////////////////////////////////////////////////////////////
+bncSslConfig bncSslConfig::instance() {
+  static bncSslConfig _sslConfig;
+  return _sslConfig;
+}
+
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncSslConfig::bncSslConfig() : 
-  QSslConfiguration(QSslConfiguration::defaultConfiguration()) 
+bncSslConfig::bncSslConfig() :
+  QSslConfiguration(QSslConfiguration::defaultConfiguration())
 {
-  
+
   bncSettings settings;
   QString dirName = settings.value("sslCaCertPath").toString();
@@ -50,5 +58,5 @@
     caCerts += QSslCertificate::fromPath(dirName+QDir::separator()+fileName);
   }
- 
+
   this->setCaCertificates(caCerts);
 }
@@ -62,5 +70,5 @@
 ////////////////////////////////////////////////////////////////////////////
 QString bncSslConfig::defaultPath() {
-  return QDir::homePath() + QDir::separator() 
+  return QDir::homePath() + QDir::separator()
          + ".config" + QDir::separator() + qApp->organizationName();
 }
Index: trunk/BNC/src/bncsslconfig.h
===================================================================
--- trunk/BNC/src/bncsslconfig.h	(revision 9738)
+++ trunk/BNC/src/bncsslconfig.h	(revision 9739)
@@ -10,7 +10,10 @@
   bncSslConfig();
   ~bncSslConfig();
+  static bncSslConfig instance();
   static QString defaultPath();
  private:
 };
 
+#define BNC_SSL_CONFIG (bncSslConfig::instance())
+
 #endif
Index: trunk/BNC/src/upload/bncuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncuploadcaster.cpp	(revision 9738)
+++ trunk/BNC/src/upload/bncuploadcaster.cpp	(revision 9739)
@@ -219,7 +219,6 @@
 
   _outSocket = new QSslSocket();
-  _outSocket->setSslConfiguration(BNC_CORE->sslConfiguration());
   _outSocket->setProxy(QNetworkProxy::NoProxy);
-
+  _outSocket->setSslConfiguration(BNC_SSL_CONFIG);
   connect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
   connect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
@@ -337,6 +336,6 @@
 
 void bncUploadCaster::slotSslSocketConnectionClosed() {
-//  disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
-//  disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
+  disconnect(_outSocket, SIGNAL(disconnected()), this, SLOT(slotSslSocketConnectionClosed()));
+  disconnect(_outSocket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(slotSslErrors(QList<QSslError>)));
   emit(newMessage("slotSslSocketConnectionClosed", true));
   if (_outSocket) {