# HG changeset patch
# User unc0rr
# Date 1309008155 -14400
# Node ID 4622f83623ac41ef453f0febf400034d2b8021ad
# Parent  dd53755e0fcaf12d6fb057828a8c10be134f9eda# Parent  c57a8878eebe1fa818047c04007f34f4df709675
merge

diff -r dd53755e0fca -r 4622f83623ac QTfrontend/pageeditteam.cpp
--- a/QTfrontend/pageeditteam.cpp	Sat Jun 25 17:22:13 2011 +0400
+++ b/QTfrontend/pageeditteam.cpp	Sat Jun 25 17:22:35 2011 +0400
@@ -145,10 +145,13 @@
         CBVoicepack = new QComboBox(GBoxTeam);
         {
             QDir tmpdir;
+            QStringList list;
             tmpdir.cd(cfgdir->absolutePath());
-            tmpdir.cd("Data/Sounds/voices");
-            QStringList list = tmpdir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
-            CBVoicepack->addItems(list);
+            if (tmpdir.cd("Data/Sounds/voices")) 
+            {
+                list = tmpdir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+                CBVoicepack->addItems(list);
+            }
 
             tmpdir.cd(datadir->absolutePath());
             tmpdir.cd("Sounds/voices");
@@ -182,12 +185,14 @@
     vbox2->addWidget(GBoxFort);
 
     QDir tmpdir;
+    QStringList userforts;
     tmpdir.cd(cfgdir->absolutePath());
-    tmpdir.cd("Data/Forts");
-    tmpdir.setFilter(QDir::Files);
-
-    QStringList userforts = tmpdir.entryList(QStringList("*L.png")).replaceInStrings(QRegExp("^(.*)L\\.png"), "\\1");
-    CBFort->addItems(userforts);
+    if (tmpdir.cd("Data/Forts"))
+    {
+        tmpdir.setFilter(QDir::Files);
+        userforts = tmpdir.entryList(QStringList("*L.png")).replaceInStrings(QRegExp("^(.*)L\\.png"), "\\1");
+        CBFort->addItems(userforts);
+    }
 
     tmpdir.cd("../Graphics/Graves");
     QStringList userlist = tmpdir.entryList(QStringList("*.png"));
@@ -207,7 +212,7 @@
     for (QStringList::Iterator it = tmplist.begin(); it != tmplist.end(); ++it)
         if (!userforts.contains(*it,Qt::CaseInsensitive)) dataforts.append(*it);
 
-    CBVoicepack->addItems(dataforts);
+    CBFort->addItems(dataforts);
     connect(CBFort, SIGNAL(currentIndexChanged(const QString &)), this, SLOT(CBFort_activated(const QString &)));
 
     tmpdir.cd("../Graphics/Graves");