Fix 'Made with GDevelop' sometimes shown when reloading the 3D editor

Author: 4ian

GDJS/GDJS/IDE/ExporterHelper.cpp

@@ -351,7 +351,7 @@ gd::String ExporterHelper::ExportProjectData(
   fs.MkDir(fs.DirNameFrom(filename));
 
   gd::SerializerElement projectDataElement;
-  ExporterHelper::StriptAndSerializeProjectData(project, projectDataElement,
+  ExporterHelper::StripAndSerializeProjectData(project, projectDataElement,
                                                 isInGameEdition,
                                                 inGameEditorResources);
 
@@ -537,15 +537,25 @@ void ExporterHelper::SerializeProjectData(gd::AbstractFileSystem &fs,
     resourcesMergingHelper.PreserveDirectoriesStructure(false);
     resourcesMergingHelper.PreserveAbsoluteFilenames(false);
   }
+
+  if (!options.fullLoadingScreen) {
+    // Most of the time, we skip the logo and minimum duration so that
+    // the preview start as soon as possible.
+    clonedProject.GetLoadingScreen()
+        .ShowGDevelopLogoDuringLoadingScreen(false)
+        .SetMinDuration(0);
+    clonedProject.GetWatermark().ShowGDevelopWatermark(false);
+  }
+
   gd::ResourceExposer::ExposeWholeProjectResources(clonedProject,
                                                    resourcesMergingHelper);
 
-  ExporterHelper::StriptAndSerializeProjectData(clonedProject, rootElement,
+  ExporterHelper::StripAndSerializeProjectData(clonedProject, rootElement,
                                                 options.isInGameEdition,
                                                 inGameEditorResources);
 }
 
-void ExporterHelper::StriptAndSerializeProjectData(
+void ExporterHelper::StripAndSerializeProjectData(
     gd::Project &project, gd::SerializerElement &rootElement,
     bool isInGameEdition,
     const std::vector<gd::InGameEditorResourceMetadata> &inGameEditorResources) {

GDJS/GDJS/IDE/ExporterHelper.h

@@ -762,7 +762,7 @@ class ExporterHelper {
    /**
     * \brief Strip a project and serialize it to JSON.
     */
-   static void StriptAndSerializeProjectData(gd::Project &project,
+   static void StripAndSerializeProjectData(gd::Project &project,
                                              gd::SerializerElement &rootElement,
                                              bool isInGameEdition,
                                              const std::vector<gd::InGameEditorResourceMetadata> &inGameEditorResources);

GDJS/Runtime/debugger-client/hot-reloader.ts

@@ -20,6 +20,7 @@ namespace gdjs {
     _reloadedScriptElement: Record<string, HTMLScriptElement> = {};
     _logs: HotReloaderLog[] = [];
     _alreadyLoadedScriptFiles: Record<string, boolean> = {};
+    _isHotReloading: boolean = false;
 
     /**
      * @param runtimeGame - The `gdjs.RuntimeGame` to be hot-reloaded.
@@ -153,6 +154,13 @@ namespace gdjs {
       projectData: ProjectData;
       runtimeGameOptions: RuntimeGameOptions;
     }): Promise<HotReloaderLog[]> {
+      if (this._isHotReloading) {
+        console.error('Hot reload already in progress, skipping.');
+        return [];
+      }
+
+      this._isHotReloading = true;
+
       logger.info('Hot reload started');
       const wasPaused = this._runtimeGame.isPaused();
       this._runtimeGame.pause(true);
@@ -270,6 +278,7 @@ namespace gdjs {
         }
       }
 
+      this._isHotReloading = false;
       logger.info(
         'Hot reload finished with logs:',
         this._logs.map((log) => '\n' + log.kind + ': ' + log.message)