Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

More merge fallout.

Browse Source
This commit is contained in:
Joshua Yanovski
2023-03-29 02:27:39 -07:00
parent 37c41c449f
commit 256a58ccd3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
voxygen/src/main.rs
View File

@ -144,6 +144,7 @@ fn main() {
let runtime = tokio::runtime::Builder::new_current_thread() let runtime = tokio::runtime::Builder::new_current_thread()
.max_blocking_threads(1) .max_blocking_threads(1)
.enable_io()
.enable_time() .enable_time()
.build() .build()
.expect("Failed to create tokio runtime."); .expect("Failed to create tokio runtime.");
@ -183,7 +184,7 @@ fn main() {
#[cfg(feature = "discord")] #[cfg(feature = "discord")]
let discord = if settings.networking.enable_discord_integration { let discord = if settings.networking.enable_discord_integration {
veloren_voxygen::discord::Discord::start(&tokio_runtime) veloren_voxygen::discord::Discord::start(&runtime)
} else { } else {
veloren_voxygen::discord::Discord::Inactive veloren_voxygen::discord::Discord::Inactive
}; };

2
voxygen/src/session/settings_change.rs
View File

@ -714,7 +714,7 @@ impl SettingsChange {
settings.networking.enable_discord_integration = enabled; settings.networking.enable_discord_integration = enabled;
if enabled { if enabled {
global_state.discord = Discord::start(&global_state.tokio_runtime); global_state.discord = Discord::start(&global_state.runtime);
#[cfg(feature = "singleplayer")] #[cfg(feature = "singleplayer")]
let singleplayer = global_state.singleplayer.is_some(); let singleplayer = global_state.singleplayer.is_some();