diff --git a/.efrocachemap b/.efrocachemap index e76d1774..e1cbe804 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4135,16 +4135,16 @@ "assets/build/windows/x64/vc_redist.x64.exe": "https://files.ballistica.net/cache/ba1/ea/19/8b8787d81abcdce158ba608cd24f", "assets/build/windows/x64/vcruntime140_1d.dll": "https://files.ballistica.net/cache/ba1/11/d8/ff6344b429b00c24d9a1930d4338", "assets/build/windows/x64/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/20/33/0825e11e6518f87ece3009309933", - "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fc/3d/ab2ccd1f76fec48d1d1f8cc07aa4", - "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e2/e1/672e2ccaceadf3b0867bf3b887a4", - "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/5f/9d/90533da6e9d91dc6b932a2aa7f43", - "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/30/ea/6af215aa0cab66e46c7041a7b091", - "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/55/66/b8bc31f6818606e282eda887939f", - "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/52/e7/2419b41d3524735dc709338c4290", - "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/11/b5/5ee7f3ba18e2683d56b8a020b39f", - "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/24/5f/6953fd0f2b47e943ea734bc14911", - "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/1b/fb/739c5d5dc13218efdeaaa020c9f9", - "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/01/15/75f7b94e3608435a4609a3992dbc", - "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/9f/9d/cf77bfbd79aed7178d9674b3af14", - "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/c9/b2/6863b197eac679f85a5414525aa9" + "build/prefab/linux-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/38/79/8482459e849c4b75b16bb100266f", + "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a9/9c/ec1fbb2000b98ee3f435e5c513fe", + "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/76/5b/db956e121da63577f936e64f3494", + "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/4c/3b/a57f68ff20e2b609e9e5206b95a5", + "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/e7/e3/50b8b93f13e62224361adc25d349", + "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/d1/1e/0a2b25787b8b8fb22bc98fd01deb", + "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/cb/bb/283f8b7e32c525a18d8ff352a909", + "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/cf/53/a41d9c765398f15c9e12fb09f901", + "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/dc/ed/d8ede234c0a7088a4779034a0546", + "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/9c/93/bcebb3578733d2d6cad663493221", + "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/2c/15/5b57e11da90398f11e8e7c72a7ca", + "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/37/a4/7a81bd34c99b3f43e2e528dd28b9" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index e03e1290..cd613e6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - Mouse wheel now works in manual camera mode on more platforms. - Lots of internal event-handling cleanup/reorganization in preparation for Android 1.5 update. - Server scripts now run in opt mode in release builds so they can use bundled .opt-1.pyc files. +- Fixes a potential crash in the local network browser. - More misc bug fixes and tidying. ### 1.5.5 (20069) diff --git a/assets/src/ba_data/python/bastd/ui/gather.py b/assets/src/ba_data/python/bastd/ui/gather.py index fecf8f6e..2fdc1e18 100644 --- a/assets/src/ba_data/python/bastd/ui/gather.py +++ b/assets/src/ba_data/python/bastd/ui/gather.py @@ -1721,7 +1721,9 @@ class GatherWindow(ba.Window): import errno # Ignore harmless errors. - if exc.errno == errno.EHOSTUNREACH: + if exc.errno in { + errno.EHOSTUNREACH, errno.ENETUNREACH + }: pass elif exc.errno == 10051: # Windows 'a socket operation was attempted