From 5ab974e140241fd205e6612540d8baa57b74d2ef Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Thu, 25 Jun 2015 11:22:15 +0200
Subject: [PATCH] GeneralEdit initial tab selection fix

---
 companion/src/generaledit/generaledit.cpp | 9 +++++++--
 companion/src/generaledit/generaledit.h   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/companion/src/generaledit/generaledit.cpp b/companion/src/generaledit/generaledit.cpp
index 69a805a4d..8a040d661 100644
--- a/companion/src/generaledit/generaledit.cpp
+++ b/companion/src/generaledit/generaledit.cpp
@@ -21,7 +21,6 @@ GeneralEdit::GeneralEdit(QWidget * parent, RadioData & radioData, Firmware * fir
   this->setWindowIcon(CompanionIcon("open.png"));
 
   QString firmware_id = g.profile[g.id()].fwType();
-  ui->tabWidget->setCurrentIndex( g.generalEditTab() );
   QString name=g.profile[g.id()].name();
   if (name.isEmpty()) {
     ui->calstore_PB->setDisabled(true);
@@ -44,6 +43,8 @@ GeneralEdit::GeneralEdit(QWidget * parent, RadioData & radioData, Firmware * fir
   }
   addTab(new TrainerPanel(this, generalSettings, firmware), tr("Trainer"));
   addTab(new CalibrationPanel(this, generalSettings, firmware), tr("Hardware / Calibration"));
+
+  ui->tabWidget->setCurrentIndex( g.generalEditTab() );
 }
 
 GeneralEdit::~GeneralEdit()
@@ -51,6 +52,11 @@ GeneralEdit::~GeneralEdit()
   delete ui;
 }
 
+void GeneralEdit::closeEvent(QCloseEvent *event)
+{
+  g.generalEditTab(ui->tabWidget->currentIndex());
+}
+
 void GeneralEdit::addTab(GenericPanel *panel, QString text)
 {
   panels << panel;
@@ -70,7 +76,6 @@ void GeneralEdit::onTabModified()
 void GeneralEdit::on_tabWidget_currentChanged(int index)
 {
   panels[index]->update();
-  g.generalEditTab(index);
 }
 
 void GeneralEdit::on_calretrieve_PB_clicked()
diff --git a/companion/src/generaledit/generaledit.h b/companion/src/generaledit/generaledit.h
index ca5a9f12d..663a37eb7 100644
--- a/companion/src/generaledit/generaledit.h
+++ b/companion/src/generaledit/generaledit.h
@@ -50,6 +50,7 @@ class GeneralEdit : public QDialog
     Firmware * firmware;
     QVector<GenericPanel *> panels;
     void addTab(GenericPanel *panel, QString text);
+    void closeEvent(QCloseEvent *event);
 
 };