From: Craig Robbins <kde.psych@gmail.com>
Date: Mon, 6 Apr 2015 01:07:51 +0000 (+1000)
Subject: Change screenshot filename to one likely to work on all modern filesystems
X-Git-Tag: 0.4.13~386
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=43aab618e52dd26b7d26f05db7df941489917a35;p=oweals%2Fminetest.git

Change screenshot filename to one likely to work on all modern filesystems
Fixes #2603
---

diff --git a/src/client.cpp b/src/client.cpp
index d2bbdc284..a0740a1e8 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1709,7 +1709,7 @@ void Client::makeScreenshot(IrrlichtDevice *device)
 	struct tm *tm = localtime(&t);
 
 	char timetstamp_c[64];
-	strftime(timetstamp_c, sizeof(timetstamp_c), "%FT%T", tm);
+	strftime(timetstamp_c, sizeof(timetstamp_c), "%Y%m%d_%H%M%S", tm);
 
 	std::string filename_base = g_settings->get("screenshot_path")
 			+ DIR_DELIM
@@ -1722,7 +1722,7 @@ void Client::makeScreenshot(IrrlichtDevice *device)
 	unsigned serial = 0;
 
 	while (serial < SCREENSHOT_MAX_SERIAL_TRIES) {
-		filename = filename_base + (serial > 0 ? ("-" + itos(serial)) : "") + filename_ext;
+		filename = filename_base + (serial > 0 ? ("_" + itos(serial)) : "") + filename_ext;
 		std::ifstream tmp(filename.c_str());
 		if (!tmp.good())
 			break;	// File did not apparently exist, we'll go with it