ignore files that are read incorrectly

Renari · Jun 8, 2016 · b3c1a3e · b3c1a3e
1 parent 84f30fc
commit b3c1a3e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/SKFM/catfile.cpp b/SKFM/catfile.cpp
@@ -109,9 +109,13 @@ CatFile::ExtraData::ExtraData(int offset, int *fileCount, QByteArray *fileData)
     QBuffer buffer(fileData);
     buffer.open(QBuffer::ReadOnly);
     buffer.seek(offset);
-    if (buffer.peek(3).toStdString() == "GXT")
+    QByteArray gxt = buffer.peek(3);
+    if (QString(gxt.data()) == "GXT")
     {
-        throw;
+        extraHeader = 0;
+        extraCount = 0;
+        extraSize = 0;
+        return;
     }
     buffer.read((char*)&extraHeader, sizeof(extraHeader));
     buffer.read((char*)&extraCount, sizeof(extraCount));

diff --git a/SKFM/mainwindow.cpp b/SKFM/mainwindow.cpp
@@ -49,8 +49,6 @@ void MainWindow::on_actionOpen_triggered()
         ui->treeWidget->clear();
         item->setText(0, QFileInfo(filePath).baseName());
 
-        try
-        {
             if (!file.suffix().compare("gxt", Qt::CaseInsensitive))
             {
                 openedResource = new GxtFile(filePath);
@@ -59,19 +57,16 @@ void MainWindow::on_actionOpen_triggered()
             {
                 openedResource = new CatFile(filePath);
             }
-        }
-        catch(int e)
+
+        int fileCount = openedResource->getFileCount();
+
+        if(fileCount == 0)
         {
-            ui->actionSave->setEnabled(false);
             ui->treeWidget->clear();
-            QMessageBox msgBox;
-            msgBox.setText("This file isn't currently supported." + e);
-            msgBox.exec();
+            ui->actionSave->setEnabled(false);
             return;
         }
 
-        int fileCount = openedResource->getFileCount();
-
         for (int i = 1; i <= fileCount; i++)
         {
             QTreeWidgetItem *childItem = new QTreeWidgetItem();