[Scummvm-git-logs] scummvm master -> 8ade383e6a4cd59efb894baff2832a2f5f22edfe

mistydemeo noreply at scummvm.org
Fri Aug 25 16:43:56 UTC 2023


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

Summary:
8ade383e6a DIRECTOR: misc xlib handles missing file


Commit: 8ade383e6a4cd59efb894baff2832a2f5f22edfe
    https://github.com/scummvm/scummvm/commit/8ade383e6a4cd59efb894baff2832a2f5f22edfe
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2023-08-25T09:43:15-07:00

Commit Message:
DIRECTOR: misc xlib handles missing file

Changed paths:
    engines/director/lingo/xlibs/misc.cpp


diff --git a/engines/director/lingo/xlibs/misc.cpp b/engines/director/lingo/xlibs/misc.cpp
index 84c2ce976b7..1741814a62a 100644
--- a/engines/director/lingo/xlibs/misc.cpp
+++ b/engines/director/lingo/xlibs/misc.cpp
@@ -70,13 +70,19 @@ MiscObject::MiscObject(ObjectType ObjectType) :Object<MiscObject>("Misc") {
 
 void Misc::m_getProfileString(int nargs) {
     Common::String file = g_lingo->pop().asString();
+    Common::String entry = g_lingo->pop().asString();
+    Common::String section = g_lingo->pop().asString();
+
     Common::Path filePath = findPath(file);
+    if (filePath.empty()) {
+        warning("Unable to locate config file %s", file.c_str());
+        g_lingo->push(Datum(""));
+        return;
+    }
+
     Common::INIFile config;
     config.loadFromFile(filePath.toString());
 
-    Common::String entry = g_lingo->pop().asString();
-    Common::String section = g_lingo->pop().asString();
-
     Common::String value;
     if (config.getKey(entry, section, value)) {
         g_lingo->push(Datum(value));




More information about the Scummvm-git-logs mailing list