[Scummvm-git-logs] scummvm master -> 812ecfb902d39eae664ba108c6c9e35390871253

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ce0d29fc46 COMPOSER: Properly strip down the relative paths
812ecfb902 JANITORIAL: Remove trailing whitespaces


Commit: ce0d29fc460e4e1a6bd1f780fb60c8b19bae992b
    https://github.com/scummvm/scummvm/commit/ce0d29fc460e4e1a6bd1f780fb60c8b19bae992b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-11-26T11:16:31+01:00

Commit Message:
COMPOSER: Properly strip down the relative paths

Changed paths:
    engines/composer/composer.cpp


diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index a04f4b6..d85ec46 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -355,6 +355,10 @@ Common::String ComposerEngine::mangleFilename(Common::String filename) {
 		filename = filename.c_str() + 1;
 
 	uint slashesToStrip = _directoriesToStrip;
+
+	if (filename.hasPrefix(".."))
+		slashesToStrip = 1;
+
 	while (slashesToStrip--) {
 		for (uint i = 0; i < filename.size(); i++) {
 			if (filename[i] != '\\' && filename[i] != ':')


Commit: 812ecfb902d39eae664ba108c6c9e35390871253
    https://github.com/scummvm/scummvm/commit/812ecfb902d39eae664ba108c6c9e35390871253
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-11-26T11:16:31+01:00

Commit Message:
JANITORIAL: Remove trailing whitespaces

Changed paths:
    engines/composer/composer.cpp


diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp
index d85ec46..1abebbe 100644
--- a/engines/composer/composer.cpp
+++ b/engines/composer/composer.cpp
@@ -122,7 +122,7 @@ Common::Error ComposerEngine::run() {
 		warning("FPS in book.ini is zero. Defaulting to 8...");
 	uint32 lastDrawTime = 0;
 	_lastSaveTime = _system->getMillis();
-	
+
 	bool loadFromLauncher = ConfMan.hasKey("save_slot");
 
 	while (!shouldQuit()) {