From fb0dcc0dd92ee099459d1a242f3c10e8b796cb81 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Mon, 11 Aug 2014 02:02:15 +0200
Subject: [PATCH] Make --makeconf warn early about an existing config (#572)

---
 src/znc.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/znc.cpp b/src/znc.cpp
index f22584d1..05cf38c3 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -566,7 +566,14 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
 	vsLines.push_back("Version = " + CString(VERSION, 1));
 
 	m_sConfigFile = ExpandConfigPath(sConfigFile);
-	CUtils::PrintMessage("Building new config");
+
+	if (CFile::Exists(m_sConfigFile)) {
+		CUtils::PrintStatus(false, "The config file [" + m_sConfigFile + "] already exists.");
+		if (!CUtils::GetBoolInput("Would you like to overwrite it?", false))
+			return false;
+	} else {
+		CUtils::PrintMessage("Building new config");
+	}
 
 	CUtils::PrintMessage("");
 	CUtils::PrintMessage("First let's start with some global settings...");
@@ -917,7 +924,7 @@ bool CZNC::WriteNewConfig(const CString& sConfigFile) {
 			} else {
 				File.Close();
 				CUtils::PrintStatus(false, "This config already exists.");
-				if (CUtils::GetBoolInput("Would you like to overwrite it?", false))
+				if (CUtils::GetBoolInput("Are you sure you want to overwrite it?", false))
 					CUtils::PrintAction("Overwriting config [" + m_sConfigFile + "]");
 				else
 					bFileOK = false;