Merge pull request #45 from slipher/resource-iter-bug

Fix iterator bug
DaemonEngine · Oct 23, 2017 · 84c07a6 · 84c07a6
2 parents b01b9f7 + 1f5f8ea
commit 84c07a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/engine/framework/Resource.h b/src/engine/framework/Resource.h
@@ -236,12 +236,12 @@ namespace Resource {
         Prune();
 
         // And then load the new ones, so as to reduce peak memory usage.
-        for (auto it = resources.begin(); it != resources.end(); ++it) {
-            if (not it->second->loaded) {
-                if (not it->second->TryLoad()) {
-                    it->second->Cleanup();
-                    it = resources.erase(it);
-                }
+        for (auto it = resources.begin(); it != resources.end(); ) {
+            if (!it->second->loaded && !it->second->TryLoad()) {
+                it->second->Cleanup();
+                it = resources.erase(it);
+            } else {
+                ++it;
             }
         }
 

diff --git a/src/shared/VMMain.cpp b/src/shared/VMMain.cpp
@@ -125,7 +125,11 @@ int main(int argc, char** argv)
 		Sys::OSExit(1);
 	}
 	char* end;
-	Sys::OSHandle rootSocket = reinterpret_cast<Sys::OSHandle>(static_cast<int>(strtol(argv[1], &end, 10)));
+#ifdef _WIN32
+	Sys::OSHandle rootSocket = reinterpret_cast<Sys::OSHandle>(static_cast<intptr_t>(strtol(argv[1], &end, 10)));
+#else
+	Sys::OSHandle rootSocket = static_cast<Sys::OSHandle>(strtol(argv[1], &end, 10));
+#endif
 	if (argv[1] == end || *end != '\0') {
 		fprintf(stderr, "Parameter is not a valid handle number\n");
 		Sys::OSExit(1);