Merge with branch1.1

1 files changed, 2 insertions, 3 deletions

diff --git a/src/overwriteinfodialog.cpp b/src/overwriteinfodialog.cpp
index 11e7b552..2ba81633 100644
--- a/src/overwriteinfodialog.cpp
+++ b/src/overwriteinfodialog.cpp
@@ -37,7 +37,6 @@ public:
 
   virtual int columnCount(const QModelIndex &parent) const {
     m_RegularColumnCount = QFileSystemModel::columnCount(parent);
-//    return m_RegularColumnCount + 1;
     return m_RegularColumnCount;
   }
 
@@ -73,7 +72,8 @@ private:
 
 OverwriteInfoDialog::OverwriteInfoDialog(ModInfo::Ptr modInfo, QWidget *parent)
   : QDialog(parent), ui(new Ui::OverwriteInfoDialog), m_FileSystemModel(NULL),
-    m_DeleteAction(NULL), m_RenameAction(NULL), m_OpenAction(NULL)
+    m_DeleteAction(NULL), m_RenameAction(NULL), m_OpenAction(NULL),
+    m_ModInfo(modInfo)
 {
   ui->setupUi(this);
 
@@ -102,7 +102,6 @@ OverwriteInfoDialog::~OverwriteInfoDialog()
   delete ui;
 }
 
-
 bool OverwriteInfoDialog::recursiveDelete(const QModelIndex &index)
 {
   for (int childRow = 0; childRow < m_FileSystemModel->rowCount(index); ++childRow) {