From 07e24dccdab0c3e4c4f3cdeac61c09539d8793a2 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 22 May 2023 01:23:38 +0300 Subject: [PATCH] Return if /modules doesn't exist --- Core/Driver/Driver.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Core/Driver/Driver.cpp b/Core/Driver/Driver.cpp index 2f667ed..3c6ba29 100644 --- a/Core/Driver/Driver.cpp +++ b/Core/Driver/Driver.cpp @@ -197,13 +197,6 @@ namespace Driver DriverConfigFile << "/config.ini"; fixme("Loading driver config file: %s", DriverConfigFile.c_str()); - VirtualFileSystem::File DriverDirectory = vfs->Open(Config.DriverDirectory); - if (!DriverDirectory.IsOK()) - { - KPrint("\eE85230Failed to open driver directory: %s! (Status: %#lx)", Config.DriverDirectory, DriverDirectory.Status); - vfs->Close(DriverDirectory); - } - debug("Loading built-in drivers"); StartAHCI(); StartVMwareMouse(); @@ -214,6 +207,14 @@ namespace Driver StartPCNET(); StartGigabit(); + VirtualFileSystem::File DriverDirectory = vfs->Open(Config.DriverDirectory); + if (!DriverDirectory.IsOK()) + { + KPrint("\eE85230Failed to open driver directory: %s! (Status: %#lx)", Config.DriverDirectory, DriverDirectory.Status); + vfs->Close(DriverDirectory); + return; + } + debug("Loading drivers from %s", Config.DriverDirectory); foreach (auto DrvFile in DriverDirectory.node->Children) {