#5479: Update MSVC build files, prevent reload while map is loading

codereader · Jan 9, 2021 · d85f8cf · d85f8cf
1 parent d2c36e2
commit d85f8cf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/radiant/autoreload/AutoReloadManager.cpp b/radiant/autoreload/AutoReloadManager.cpp
@@ -60,6 +60,13 @@ void AutoReloadManager::onDirChanged(wxFileSystemWatcherEvent &ev)
 
 void AutoReloadManager::onTimerIntervalReached(wxTimerEvent &ev)
 {
+    //If a map is in the middle of loading, try again later
+    if (!GlobalSceneGraph().root())
+    {
+        _updateTimer.StartOnce(100);
+    }
+
+    //Call all requested update commands
     if (_modelsNeedUpdate)
     {
         rMessage() << "models directory changed, reloading..." << std::endl;

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -194,6 +194,7 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\radiant\autoreload\AutoReloadManager.cpp" />
     <ClCompile Include="..\..\radiant\camera\GlobalCameraWndManager.cpp" />
     <ClCompile Include="..\..\radiant\clipboard\ClipboardModule.cpp" />
     <ClCompile Include="..\..\radiant\eventmanager\Accelerator.cpp" />
@@ -372,6 +373,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\ApplicationContext.h" />
+    <ClInclude Include="..\..\radiant\autoreload\AutoReloadManager.h" />
     <ClInclude Include="..\..\radiant\camera\FloorHeightWalker.h" />
     <ClInclude Include="..\..\radiant\camera\GlobalCameraWndManager.h" />
     <ClInclude Include="..\..\radiant\camera\tools\CameraMouseToolEvent.h" />

diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -8,9 +8,6 @@
     <Filter Include="src\camera">
       <UniqueIdentifier>{ad6d0e12-fb85-4133-aecd-986e24357256}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\render">
-      <UniqueIdentifier>{53ac0d31-452b-4324-88e2-3790b4c41113}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\textool">
       <UniqueIdentifier>{d3a05c23-9351-4bd7-aaee-8f88331f691d}</UniqueIdentifier>
     </Filter>
@@ -176,6 +173,12 @@
     <Filter Include="src\ui\mapselector">
       <UniqueIdentifier>{6ddb8b69-4e5a-4c82-b7d4-aa1306342340}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\autoreload">
+      <UniqueIdentifier>{4031ea1f-cad1-42c8-a5cf-b9a2089c3afa}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\render">
+      <UniqueIdentifier>{53ac0d31-452b-4324-88e2-3790b4c41113}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\radiant\main.cpp">
@@ -676,6 +679,9 @@
     <ClCompile Include="..\..\radiant\ui\modelselector\ModelTreeView.cpp">
       <Filter>src\ui\modelselector</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\autoreload\AutoReloadManager.cpp">
+      <Filter>src\autoreload</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h">
@@ -1302,6 +1308,9 @@
     <ClInclude Include="..\..\radiant\ui\modelselector\ModelTreeView.h">
       <Filter>src\ui\modelselector</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\autoreload\AutoReloadManager.h">
+      <Filter>src\autoreload</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />