Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Fixed some other bugs

Browse source
This commit is contained in:
Ceikry 2021-03-11 13:58:26 -06:00
parent bef8478954
commit f75cdb079d
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Client/src/main/kotlin/org/rs09/Discord.kt
View file

@ -15,9 +15,10 @@ object Discord {
var initialized = false
@JvmStatic
//Removed support for Linux due to the outlined issue on line 37. TODO: Revisit this when the RPC library updates. There's a PR there that *should* fix it.
fun checkInitializable() : Boolean{
val OS = System.getProperty("os.name")
if(OS.toLowerCase().startsWith("windows") || OS.toLowerCase().contains("nux")){
if(OS.toLowerCase().startsWith("windows")){
val arch = System.getProperty("os.arch")
return arch != "aarch64" && !initialized
}
@ -33,7 +34,9 @@ object Discord {
DiscordRPC.discordShutdown()
}.build()
DiscordRPC.discordInitialize(APP_ID,handlers,true)
//On Linux, when the discord library initializes, it can crash any other client loading the same library.
//Not sure what causes this, likely a JVM bug to be honest.
DiscordRPC.discordInitialize(APP_ID, handlers, true)
initialized = true
}