discordnet: don't start discord if not detected

gyf304 · Feb 2, 2021 · 5a43886 · 5a43886
1 parent 010a67e
commit 5a43886
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/discordnet.cpp b/src/discordnet.cpp
@@ -52,16 +52,15 @@ void DiscordNet::run()
 	discord::User user;
 	discord::Core *_core{};
 	std::shared_ptr<discord::Core> core;
-	auto result = discord::Core::Create(DISCORD_APP_ID, DiscordCreateFlags_Default, &_core);
-	core.reset(_core);
-	if (!core)
-	{
+	auto result = discord::Core::Create(DISCORD_APP_ID, DiscordCreateFlags_NoRequireDiscord, &_core);
+	if (result != discord::Result::Ok) {
 		mutex.lock();
-		exception = std::runtime_error("Cannot instantiate discord service");
+		exception = std::runtime_error("Cannot instantiate discord service. Make sure discord is running.");
 		mutex.unlock();
 		interrupted = true;
 		return;
 	}
+	core.reset(_core);
 
 	auto &lm = core->LobbyManager();
 	auto &um = core->UserManager();