From 1db00e991d638be2f1b3f893f6b524363d66afb5 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 10 May 2019 22:29:02 +0200
Subject: [PATCH] Segfault removed

---
 companion/src/firmwares/generalsettings.cpp | 2 +-
 companion/src/storage/appdata.cpp           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/companion/src/firmwares/generalsettings.cpp b/companion/src/firmwares/generalsettings.cpp
index 8ca9920b8..93035f9f6 100644
--- a/companion/src/firmwares/generalsettings.cpp
+++ b/companion/src/firmwares/generalsettings.cpp
@@ -122,7 +122,7 @@ GeneralSettings::GeneralSettings()
   templateSetup = g.profile[g.sessionId()].channelOrder();
   stickMode = g.profile[g.sessionId()].defaultMode();
 
-  QString t_calib; // TODO SEGFAULT = g.profile[g.sessionId()].stickPotCalib();
+  QString t_calib = g.profile[g.sessionId()].stickPotCalib();
   int potsnum = getBoardCapability(getCurrentBoard(), Board::Pots);
   if (!t_calib.isEmpty()) {
     QString t_trainercalib=g.profile[g.sessionId()].trainerCalib();
diff --git a/companion/src/storage/appdata.cpp b/companion/src/storage/appdata.cpp
index f219077ad..5e64ad8fc 100644
--- a/companion/src/storage/appdata.cpp
+++ b/companion/src/storage/appdata.cpp
@@ -293,7 +293,7 @@ void Profile::resetFwVariables()
 
 AppData::AppData() :
   CompStoreObj(),
-  m_sessionId(-1)
+  m_sessionId(0)
 {
   QMetaType::registerComparators<SimulatorOptions>();
   qRegisterMetaTypeStreamOperators<SimulatorOptions>("SimulatorOptions");