[GUI] Proper tab name to results. Fixes simulationcraft#3621

ellen-wu · Jul 12, 2017 · 553663c · 553663c
1 parent a8340e5
commit 553663c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/qt/sc_window.cpp b/qt/sc_window.cpp
@@ -783,7 +783,6 @@ void SC_MainWindow::startSim()
   }
   optionsTab -> encodeOptions();
   importTab -> automationTab -> encodeSettings();
-  QString tab_name = simulateTab -> tabText(simulateTab -> currentIndex());
 
   // Clear log text on success so users don't get confused if there is
   // an error from previous attempts
@@ -794,9 +793,11 @@ void SC_MainWindow::startSim()
   simProgress = 0;
   sim = initSim();
 
-  QString options = simulationQueue.dequeue();
+  auto value = simulationQueue.dequeue();
+
+  QString tab_name = std::get<0>( value );
+  QByteArray utf8_profile = std::get<1>( value ).toUtf8();
 
-  QByteArray utf8_profile = options.toUtf8();
   QFile file( AppDataDir + QDir::separator() + "simc_gui.simc" );
   if ( file.open( QIODevice::WriteOnly | QIODevice::Text ) )
   {

diff --git a/qt/simulationcraftqt.hpp b/qt/simulationcraftqt.hpp
@@ -279,17 +279,20 @@ class SC_QueueItemModel : public QStandardItemModel
 
     appendRow( item );
   }
-  QString dequeue()
+  std::tuple<QString, QString> dequeue()
   {
     QModelIndex indx = index( 0, 0 );
-    QString retval;
+    std::tuple<QString, QString> retval;
+
     if ( indx.isValid() )
     {
-      retval = indx.data( Qt::UserRole + 1 ).toString();
+      retval = std::make_tuple( indx.data( Qt::DisplayRole ).toString(),
+                                indx.data( Qt::UserRole + 1 ).toString() );
       removeRow( 0 );
     }
     return retval;
   }
+
   bool isEmpty() const
   {
     return rowCount() <= 0;