Sfoglia il codice sorgente

Avoid assert from RemoteConsoleCore when use the prefab system (#8683)

Signed-off-by: Junbo Liang <[email protected]>
Junbo Liang 3 anni fa
parent
commit
a02a586b69
1 ha cambiato i file con 16 aggiunte e 10 eliminazioni
  1. 16 10
      Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp

+ 16 - 10
Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp

@@ -9,6 +9,7 @@
 #include <AzCore/Socket/AzSocket.h>
 #include <AzCore/Socket/AzSocket.h>
 
 
 #include <AzFramework/StringFunc/StringFunc.h>
 #include <AzFramework/StringFunc/StringFunc.h>
+#include <AzFramework/API/ApplicationAPI.h>
 
 
 #include <platform.h>
 #include <platform.h>
 #include <IConsole.h>
 #include <IConsole.h>
@@ -487,21 +488,26 @@ void SRemoteClient::FillAutoCompleteList(AZStd::vector<AZStd::string>& list)
         return;
         return;
     }
     }
 
 
-    for (int i = 0, end = gEnv->pSystem->GetILevelSystem()->GetLevelCount(); i < end; ++i)
+    bool usePrefabSystemForLevels = false;
+    AzFramework::ApplicationRequests::Bus::BroadcastResult(usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
+    if (!usePrefabSystemForLevels)
     {
     {
-        ILevelInfo* pLevel = gEnv->pSystem->GetILevelSystem()->GetLevelInfo(i);
-        AZStd::string item = "map ";
-        const char* levelName = pLevel->GetName();
-        int start = 0;
-        for (int k = 0, kend = static_cast<int>(strlen(levelName)); k < kend; ++k)
+        for (int i = 0, end = gEnv->pSystem->GetILevelSystem()->GetLevelCount(); i < end; ++i)
         {
         {
-            if ((levelName[k] == '\\' || levelName[k] == '/') && k + 1 < kend)
+            ILevelInfo* pLevel = gEnv->pSystem->GetILevelSystem()->GetLevelInfo(i);
+            AZStd::string item = "map ";
+            const char* levelName = pLevel->GetName();
+            int start = 0;
+            for (int k = 0, kend = static_cast<int>(strlen(levelName)); k < kend; ++k)
             {
             {
-                start = k + 1;
+                if ((levelName[k] == '\\' || levelName[k] == '/') && k + 1 < kend)
+                {
+                    start = k + 1;
+                }
             }
             }
+            item += levelName + start;
+            list.push_back(item);
         }
         }
-        item += levelName + start;
-        list.push_back(item);
     }
     }
 }
 }