From ba185e3eba1c75740bb866100e7a4b3b9c4d38b0 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Mon, 22 Oct 2018 12:54:19 +0200
Subject: [PATCH] Zero out VirtualFileSystem::s_the in initializeGlobals().

This catches attempts to access the vfs before it's been constructed.
---
 VirtualFileSystem/VirtualFileSystem.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/VirtualFileSystem/VirtualFileSystem.cpp b/VirtualFileSystem/VirtualFileSystem.cpp
index 4542f244f9..4f5b11aa2b 100644
--- a/VirtualFileSystem/VirtualFileSystem.cpp
+++ b/VirtualFileSystem/VirtualFileSystem.cpp
@@ -7,11 +7,6 @@
 
 //#define VFS_DEBUG
 
-void VirtualFileSystem::initializeGlobals()
-{
-    FileSystem::initializeGlobals();
-}
-
 static dword encodedDevice(unsigned major, unsigned minor)
 {
     return (minor & 0xff) | (major << 8) | ((minor & ~0xff) << 12);
@@ -25,6 +20,12 @@ VirtualFileSystem& VirtualFileSystem::the()
     return *s_the;
 }
 
+void VirtualFileSystem::initializeGlobals()
+{
+    s_the = nullptr;
+    FileSystem::initializeGlobals();
+}
+
 VirtualFileSystem::VirtualFileSystem()
 {
 #ifdef VFS_DEBUG