4 files changed, 7 insertions, 2 deletions
diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp
index dcefe0561..690a31e50 100644
--- a/src/kvilib/file/KviFileUtils.cpp
+++ b/src/kvilib/file/KviFileUtils.cpp
@@ -466,7 +466,7 @@ namespace KviFileUtils
 			if(cur.unicode() == 0 || cur=='/')
 #endif
 			{
-				szPath += '_';
+				szPath += '-';
 			} else {
 				szPath += cur;
 			}
diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp
index 9fa1a2538..4f266bb69 100644
--- a/src/kvirc/ui/KviChannelWindow.cpp
+++ b/src/kvirc/ui/KviChannelWindow.cpp
@@ -2026,6 +2026,8 @@ KviIrcConnectionServerInfo * KviChannelWindow::serverInfo()
 	return connection()->serverInfo();
 }
 
+// FIXME: this currently does not work if the user has changed his date format,
+// since . is hardcoded as date parts separator.
 void KviChannelWindow::pasteLastLog()
 {
 	QString szChannel = target().toLower();
diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp
index 023065f0f..1c7f26731 100644
--- a/src/kvirc/ui/KviQueryWindow.cpp
+++ b/src/kvirc/ui/KviQueryWindow.cpp
@@ -713,6 +713,8 @@ void KviQueryWindow::ownAction(const QString & szBuffer)
 	}
 }
 
+// FIXME: this currently does not work if the user has changed his date format,
+// since . is hardcoded as date parts separator.
 void KviQueryWindow::pasteLastLog()
 {
 	QString szQuery = target().toLower();
diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp
index 34e1f8a2b..9732022bb 100644
--- a/src/kvirc/ui/KviWindow.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -536,7 +536,8 @@ void KviWindow::getDefaultLogFileName(QString & szBuffer)
 			szDate = date.toString("yyyy.MM.dd");
 			break;
 	}
-	szDate.replace(KVI_PATH_SEPARATOR_CHAR, '-');
+	szDate.replace('_', '-'); // this would confuse the log viewer
+	KviFileUtils::cleanFileName(szDate);
 
 	QString szBase;
 	getBaseLogFileName(szBase);