added and moved initializations

andrew-bibb · Mar 17, 2018 · 386bccc · 386bccc
1 parent 495ab94
commit 386bccc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apps/cmstapp/code/control_box/controlbox.cpp b/apps/cmstapp/code/control_box/controlbox.cpp
@@ -317,6 +317,8 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
   QTimer::singleShot(8 * 1000, this, SLOT(connectNotifyClient()));
 
   // setup the dbus interface to connman.manager
+  con_manager = NULL;
+  vpn_manager = NULL;
   if (! QDBusConnection::systemBus().isConnected() ) logErrors(CMST::Err_No_DBus);
   else {
     con_manager = new QDBusInterface(DBUS_CON_SERVICE, DBUS_PATH, DBUS_CON_MANAGER, QDBusConnection::systemBus(), this);
@@ -352,7 +354,6 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
       this->clearCounters();
 
       // VPN manager. Disable if commandline or option is set
-      vpn_manager = NULL;
       if (parser.isSet("disable-vpn") ? true : (b_so && ui.checkBox_disablevpn->isChecked()) ) {
         ui.tabWidget->setTabEnabled(ui.tabWidget->indexOf(ui.VPN), false);
         ui.pushButton_vpn_editor->setDisabled(true);

diff --git a/apps/resource.h b/apps/resource.h
@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
 ///////////////////////////////// Program Values ///////////////////////
 //
 // Program Info (may be visible, but don't mark for tranalation) 
-#define VERSION "2018.01.21-1"
+#define VERSION "2018.03.17-1"
 
 #define RELEASE_DATE "6 January 2018"
 #define COPYRIGHT_DATE "2013-2018"