Fix crash with metadata

Don't try to access non-present fields. Weed them out!

2 files changed, 5 insertions, 18 deletions

diff --git a/archiveview.cpp b/archiveview.cpp
index adff0f0..4cf24d0 100644
--- a/archiveview.cpp
+++ b/archiveview.cpp
@@ -797,22 +797,17 @@ QList<QVariant> MetadataEditorWidget::metadata() const{
         retval << QVariant();
     }
     retval[ArchiveModel::ReleaseYear] = mReleaseYear->value();
-    retval[ArchiveModel::Source] = mSource->currentText();
+    QString source = "torrent";
+    if(mUsenet->isChecked()){
+        source = "Usenet";
+    }
+    retval[ArchiveModel::Source] = source;
     retval[ArchiveModel::Subject] = mSubject->text();
-    retval[ArchiveModel::ReleaseGroup] = mRelGroup->currentText();
-    retval[ArchiveModel::EncoderOpts] = mEncoderOpts->text();
-    retval[ArchiveModel::Passes] = mPasses->value();
     retval[ArchiveModel::Comment] = mComment->toPlainText();
     retval[ArchiveModel::Added] = mAdded;
     return retval;
 }
 
-void MetadataEditorWidget::setEnabledAll(bool enabled){
-    foreach(QWidget *w, mWidgets){
-        w->setEnabled(enabled);
-    }
-}
-
 /* Metadata Editor */
 MetadataEditor::MetadataEditor(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f){
     mWidget = new MetadataEditorWidget;
diff --git a/archiveview.h b/archiveview.h
index ffb4c0d..202e2f9 100644
--- a/archiveview.h
+++ b/archiveview.h
@@ -205,23 +205,15 @@ class MetadataEditorWidget : public QWidget {
         void setMetadata(const QList<QVariant> &data);
         QList<QVariant> metadata() const;
 
-    public slots:
-      void setEnabledAll(bool enabled);
-
     signals:
         void oldSelected(const QString &);
 
     private:
         QSpinBox *mReleaseYear;
-        QComboBox *mSource;
-        QComboBox *mRelGroup;
         QLineEdit *mSubject;
-        QLineEdit *mEncoderOpts;
-        QSpinBox *mPasses;
         QTextEdit *mComment;
         QRadioButton *mTorrent;
         QRadioButton *mUsenet;
-        QLineEdit *mOldSizeLE;
         QDate mAdded;
         QList<QWidget*> mWidgets;
 };