From 09290864288d2c1d6a803f0beefed4aef4c6f767 Mon Sep 17 00:00:00 2001
From: walker0643 <>
Date: Sat, 27 Jan 2018 20:50:30 -0500
Subject: [PATCH] fix SSL fingerprint text and about box copyright text

---
 src/gui/src/AboutDialogBase.ui | 2 +-
 src/gui/src/MainWindow.cpp     | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/gui/src/AboutDialogBase.ui b/src/gui/src/AboutDialogBase.ui
index 218f0488..910ecf2b 100644
--- a/src/gui/src/AboutDialogBase.ui
+++ b/src/gui/src/AboutDialogBase.ui
@@ -52,7 +52,7 @@
      <property name="text">
       <string>&lt;p&gt;
 Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
-Copyright © 2012-2018 Debauchee Open Source Group&lt;br /&gt;
+Copyright © 2018 Debauchee Open Source Group&lt;br /&gt;
 Copyright © 2012-2016 Symless Ltd.&lt;br /&gt;
 Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt;
 Barrier is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 68d7063d..9f278c29 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -133,6 +133,8 @@ MainWindow::MainWindow(QSettings& settings, AppConfig& appConfig) :
     m_pComboServerList->hide();
     m_pLabelPadlock->hide();
 
+    sslToggled(appConfig.getCryptoEnabled());
+
     connect (this, SIGNAL(windowShown()),
              this, SLOT(on_windowShown()), Qt::QueuedConnection);
 
@@ -494,12 +496,6 @@ void MainWindow::restartBarrier()
 
 void MainWindow::proofreadInfo()
 {
-    if (m_AppConfig->getCryptoEnabled()) {
-        m_pSslCertificate = new SslCertificate(this);
-        m_pSslCertificate->generateCertificate();
-    }
-    updateLocalFingerprint();
-    saveSettings();
     int oldState = m_BarrierState;
     m_BarrierState = barrierDisconnected;
     setBarrierState((qBarrierState)oldState);