Change screenshot filename to one likely to work on all modern filesystems

Fixes #2603
master
Craig Robbins 2015-04-06 11:07:51 +10:00
parent 8804c47e59
commit 43aab618e5
1 changed files with 2 additions and 2 deletions

View File

@ -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