Fixed: Crash in lua getWeatherValue() when continent was not loaded

--HG-- branch : develop
6 years ago · ec9a0e6d38
parent 6c1d44bc51
commit ec9a0e6d38
1 changed files with 7 additions and 1 deletions
--- a/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
+++ b/code/ryzom/client/src/interface_v3/lua_ihm_ryzom.cpp
@ -1688,7 +1688,13 @@ int CLuaIHMRyzom::getWeatherValue(CLuaState &ls)
 	CLuaIHM::checkArgCount(ls, funcName, 0);
 	uint64 currDay = RT.getRyzomDay();
 	float currHour = (float) RT.getRyzomTime();
-	ls.push(::getBlendedWeather(currDay, currHour, *WeatherFunctionParams, ContinentMngr.cur()->WeatherFunction));
+	float weather = 0.f;
+	if (ContinentMngr.cur())
+	{
+		weather = ::getBlendedWeather(currDay, currHour, *WeatherFunctionParams, ContinentMngr.cur()->WeatherFunction);
+	}
+
+	ls.push(weather);
 	return 1;
 }