From 0fd6e4c2c9016f6e5aab2bcd95af163d852b3383 Mon Sep 17 00:00:00 2001
From: Cameron Cawley
Date: Wed, 18 Sep 2019 15:34:15 +0100
Subject: RISCOS: Don't try to load the required modules if they aren't
 installed

---
 dists/riscos/!Run,feb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'dists')

diff --git a/dists/riscos/!Run,feb b/dists/riscos/!Run,feb
index 8def7f7fa4..531d94babb 100644
--- a/dists/riscos/!Run,feb
+++ b/dists/riscos/!Run,feb
@@ -1,11 +1,15 @@
 Run <Obey$Dir>.!Boot
 
-RMEnsure SharedUnixLibrary 1.14 RMLoad System:Modules.SharedULib
+Set Alias$RMLoadIfThere IfThere %%0 Then RMLoad %%*0
+
+RMEnsure SharedUnixLibrary 1.14 RMLoadIfThere System:Modules.SharedULib
 RMEnsure SharedUnixLibrary 1.14 Error ScummVM requires SharedUnixLibrary 1.14 or later. This can be downloaded from https://www.riscos.info/packages/LibraryDetails.html#SharedUnixLibrary
 
-RMEnsure DigitalRenderer 0.56 RMLoad System:Modules.DRenderer
+RMEnsure DigitalRenderer 0.56 RMLoadIfThere System:Modules.DRenderer
 RMEnsure DigitalRenderer 0.56 Error ScummVM requires DigitalRenderer 0.56 or later. This can be downloaded from https://www.riscos.info/packages/LibraryDetails.html#DRenderer
 
+Unset Alias$RMLoadIfThere
+
 | If running from the desktop, redirect stdout and stderr to a file.
 | This shouldn't happen when running from the command line, so that commands like "<ScummVM$Dir> --help" still work as expected.
 Set Alias$Run_ScummVM Run <ScummVM$Dir>.scummvm %%*0 ><Choices$Write>.ScummVM.stdout 2><Choices$Write>.ScummVM.stderr
-- 
cgit v1.2.3