From e43f126b03539c9d46e7712af9268505f256a898 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Thu, 19 Dec 2013 20:30:39 +0100
Subject: - bugfix: crash on overwriting a mod (introduced after the previous
 release) - bugfix: ncc installer now brings the installer window to front
 (again? more reliably? not sure if it really worked before)

---
 src/installationmanager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/installationmanager.cpp')

diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 07c015ea..e6e660e6 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -440,7 +440,9 @@ bool InstallationManager::testOverwrite(GuessedValue<QString> &modName, bool *me
           return false;
         }
       }
-      *merge = (overwriteDialog.action() == QueryOverwriteDialog::ACT_MERGE);
+      if (merge != nullptr) {
+        *merge = (overwriteDialog.action() == QueryOverwriteDialog::ACT_MERGE);
+      }
       if (overwriteDialog.action() == QueryOverwriteDialog::ACT_RENAME) {
         bool ok = false;
         QString name = QInputDialog::getText(m_ParentWidget, tr("Mod Name"), tr("Name"),
-- 
cgit v1.3.1