vaporvee/discord-rpc-godot
1
2
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases 20 Wiki Activity

Merge pull request #81 from SmiterG/crash_fix

Browse Source 
Fix: Editor crash when creating new scene
This commit is contained in:
Yannik
2025-07-10 12:21:01 +01:00
committed by GitHub
parent 1d14de9cf4 0d25a45a57
commit 852e3b09ea
1 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/editor_presence.cpp
View File

@@ -43,13 +43,39 @@ void EditorPresence::_ready()
void EditorPresence::_process(double delta) void EditorPresence::_process(double delta)
{ {
if (state_string.utf8() != activity.GetState()) godot::Node *edited_scene_root = get_tree()->get_edited_scene_root();
if (edited_scene_root != nullptr)
{ {
godot::Node *edited_scene_root = get_tree()->get_edited_scene_root(); godot::String scene_path = edited_scene_root->get_scene_file_path();
activity.SetState(String("Editing: \"" + edited_scene_root->get_scene_file_path() + "\"").replace("res://", "").utf8());
if (result == discord::Result::Ok) if (scene_path.is_empty())
core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {}); {
state_string = "Editing: (not saved scene)";
}
else
{
state_string = "Editing: \"" + scene_path.replace("res://", "") + "\"";
}
if (state_string.utf8() != activity.GetState())
{
activity.SetState(state_string.utf8());
if (result == discord::Result::Ok)
core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {});
}
} }
else
{
godot::String default_state = "No Scene Loaded";
if (default_state.utf8() != activity.GetState())
{
activity.SetState(default_state.utf8());
if (result == discord::Result::Ok)
core->ActivityManager().UpdateActivity(activity, [](discord::Result result) {});
}
}
if (result == discord::Result::Ok) if (result == discord::Result::Ok)
core->RunCallbacks(); core->RunCallbacks();
} }