Merge lp:~oopsdude/stellarium/stellarium into lp:stellarium

[Mike Storm]

These commits fix a crash in the TUI plugin that happened when the user tried to display a TuiNodeEnum that had been created with an empty list of elements.

To reproduce it, rename your "locale" directory to something else. Then activate the TUI plugin, press "m", and navigate to "3. General -> 3.2. Language: XXX". Stellarium should crash with a SIGABRT triggered at TuiNodeEnum.cpp:71, since the stringList field is empty. I only noticed this because my dev build doesn't have a "locale" directory.

Anyway, this patch detects when the list of elements is empty, and displays the default value instead. Maybe it should display something like "(none)" instead; it's up to you.

Best,
Mike

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'plugins/TextUserInterface/src/TuiNodeEnum.cpp'
--- plugins/TextUserInterface/src/TuiNodeEnum.cpp	2012-04-01 21:12:29 +0000
+++ plugins/TextUserInterface/src/TuiNodeEnum.cpp	2012-11-26 00:28:20 +0000
@@ -22,7 +22,7 @@
 
 TuiNodeEnum::TuiNodeEnum(const QString& text, QObject* receiver, const char* method, QStringList items,
                          QString defValue, TuiNode* parent, TuiNode* prev)
-	: TuiNodeEditable(text, parent, prev), stringList(items)
+    : TuiNodeEditable(text, parent, prev), stringList(items), defValue(defValue)
 {
 	this->connect(this, SIGNAL(setValue(QString)), receiver, method);
 
@@ -68,15 +68,20 @@
 
 QString TuiNodeEnum::getDisplayText() 
 {
-	QString value = q_(stringList.at(currentIdx));
-	if (!editing)
-	{
-		return prefixText + q_(displayText) + QString(":  %1").arg(value);
-	}
-	else
-	{
-		return prefixText + q_(displayText) + QString(": >%1<").arg(value);
-	}
+    if (!stringList.isEmpty())
+    {
+        QString value = q_(stringList.at(currentIdx));
+        if (!editing)
+        {
+            return prefixText + q_(displayText) + QString(":  %1").arg(value);
+        }
+        else
+        {
+            return prefixText + q_(displayText) + QString(": >%1<").arg(value);
+        }
+    }
+    else
+    {
+        return prefixText + q_(displayText) + QString(":  %1").arg(defValue);
+    }
 }
-
-

=== modified file 'plugins/TextUserInterface/src/TuiNodeEnum.hpp'
--- plugins/TextUserInterface/src/TuiNodeEnum.hpp	2012-01-11 10:50:37 +0000
+++ plugins/TextUserInterface/src/TuiNodeEnum.hpp	2012-11-26 00:28:20 +0000
@@ -50,7 +50,8 @@
 private:
 	int currentIdx;
 	QStringList stringList;
-	
+    QString defValue;
+
 };
 
 #endif /*_TUINODEENUM*/