thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SDL: Fix Windows screenshots with unicode paths

Browse source 
Use Common::FSNode to test for screenshot existence instead of
SDL_RWFromFile(). SDL does different character encoding conversions
which fail on Windows when a unicode character is in the path.

Fixes bug #11118
This commit is contained in:
sluicebox 2019-11-09 15:14:47 -08:00 • committed by Filippos Karapetis
parent 4952d1c760
commit b593fe2f45
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backends/graphics/sdl/sdl-graphics.cpp
View file

@ -25,6 +25,7 @@
#include "backends/platform/sdl/sdl.h"
#include "backends/events/sdl/sdl-events.h"
#include "common/config-manager.h"
#include "common/fs.h"
#include "common/textconsole.h"
#include "graphics/scaler/aspect.h"
#ifdef USE_OSD
@ -279,19 +280,16 @@ void SdlGraphicsManager::saveScreenshot() {
screenshotsPath = sdl_g_system->getScreenshotsPath();
for (int n = 0;; n++) {
SDL_RWops *file;
#ifdef USE_PNG
filename = Common::String::format("scummvm%05d.png", n);
#else
filename = Common::String::format("scummvm%05d.bmp", n);
#endif
file = SDL_RWFromFile((screenshotsPath + filename).c_str(), "r");
if (!file)
Common::FSNode file = Common::FSNode(screenshotsPath + filename);
if (!file.exists()) {
break;
SDL_RWclose(file);
}
}
if (saveScreenshot(screenshotsPath + filename)) {