[Scummvm-git-logs] scummvm master -> bc0553951f720998a907f64accb15e203a757faf

[whiterandrek]

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:
0479ed53fd PINK: JANITORIAL: formatting fix
bc0553951f PINK: fix crash when there isn't html files


Commit: 0479ed53fd9f08d587762fcf91258689e152d6f2
    https://github.com/scummvm/scummvm/commit/0479ed53fd9f08d587762fcf91258689e152d6f2
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-03-15T13:59:35+02:00

Commit Message:
PINK: JANITORIAL: formatting fix

Changed paths:
    engines/pink/gui.cpp


diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 815faadff6..91c3e17ed7 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -234,7 +234,7 @@ bool PinkEngine::executePageChangeCommand(uint id) {
 }
 
 void PinkEngine::openLocalWebPage(const Common::String &pageName) const {
-	Common::FSNode gameFolder= Common::FSNode(ConfMan.get("path"));
+	Common::FSNode gameFolder = Common::FSNode(ConfMan.get("path"));
 	Common::FSNode filePath = gameFolder.getChild("INSTALL").getChild(pageName);
 	Common::String fullUrl = Common::String::format("file:///%s", filePath.getPath().c_str());
 	_system->openUrl(fullUrl);


Commit: bc0553951f720998a907f64accb15e203a757faf
    https://github.com/scummvm/scummvm/commit/bc0553951f720998a907f64accb15e203a757faf
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-03-15T14:01:55+02:00

Commit Message:
PINK: fix crash when there isn't html files

Changed paths:
    engines/pink/gui.cpp


diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 91c3e17ed7..79179f5103 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -236,8 +236,10 @@ bool PinkEngine::executePageChangeCommand(uint id) {
 void PinkEngine::openLocalWebPage(const Common::String &pageName) const {
 	Common::FSNode gameFolder = Common::FSNode(ConfMan.get("path"));
 	Common::FSNode filePath = gameFolder.getChild("INSTALL").getChild(pageName);
-	Common::String fullUrl = Common::String::format("file:///%s", filePath.getPath().c_str());
-	_system->openUrl(fullUrl);
+	if (filePath.exists()) {
+		Common::String fullUrl = Common::String::format("file:///%s", filePath.getPath().c_str());
+		_system->openUrl(fullUrl);
+	}
 }
 
 } // End of namespace Pink